test/test_process.rb in god-0.7.17 vs test/test_process.rb in god-0.7.18

@@ -51,15 +51,11 @@
   def test_valid_should_return_true_if_uid_does_not_exists
     @p.start = 'qux'
     @p.log = '/tmp/foo.log'
     @p.uid = 'foobarbaz'
     
-    no_stdout do
-      no_stderr do
-        assert !@p.valid?
-      end
-    end
+    assert !@p.valid?
   end
   
   def test_valid_should_return_true_if_gid_exists
     @p.start = 'qux'
     @p.log = '/tmp/foo.log'
@@ -71,25 +67,41 @@
   def test_valid_should_return_false_if_gid_does_not_exists
     @p.start = 'qux'
     @p.log = '/tmp/foo.log'
     @p.gid = 'foobarbaz'
     
-    no_stdout do
-      no_stderr do
-        assert !@p.valid?
-      end
-    end
+    assert !@p.valid?
   end
 
+  def test_valid_should_return_true_if_dir_exists
+    @p.start = 'qux'
+    @p.log = '/tmp/foo.log'
+    @p.dir = '/tmp'
+
+    assert @p.valid?
+  end
+
+  def test_valid_should_return_false_if_dir_does_not_exists
+    @p.start = 'qux'
+    @p.log = '/tmp/foo.log'
+    @p.dir = '/tmp/doesnotexist'
+
+    assert !@p.valid?
+  end
+
+  def test_valid_should_return_false_if_dir_is_not_a_dir
+    @p.start = 'qux'
+    @p.log = '/tmp/foo.log'
+    @p.dir = '/etc/passwd'
+
+    assert !@p.valid?
+  end
+
   def test_valid_should_return_false_with_bogus_chroot
     @p.chroot = '/bogusroot'
 
-    no_stdout do
-      no_stderr do
-        assert !@p.valid?
-      end
-    end
+    assert !@p.valid?
   end
 
   def test_valid_should_return_true_with_chroot_and_valid_log
     @p.start = 'qux'
     @p.chroot = '/tmp'
@@ -150,21 +162,10 @@
   # valid?
   
   def test_valid_should_return_false_if_no_start
     @p.name = 'foo'
     @p.stop = 'baz'
-    no_stdout do
-      assert !@p.valid?
-    end
-  end
-  
-  def test_valid_should_return_false_if_self_daemonized_and_no_stop
-    @p.start = 'bar'
-    @p.pid_file = 'foo'
-    
-    no_stdout do
-      assert !@p.valid?
-    end
+    assert !@p.valid?
   end
   
   # pid
   
   def test_pid_should_return_integer_for_valid_pid_files