removing evaluate test

git-svn-id: https://reductivelabs.com/svn/puppet/library/trunk@144 980ebf18-57e1-0310-9a29-db15c13687c0

1 files changed, 16 insertions, 21 deletions

diff --git a/test/objects/tc_service.rb b/test/objects/tc_service.rb
index 36788eae4..ab7fc1262 100644
--- a/test/objects/tc_service.rb
+++ b/test/objects/tc_service.rb
@@ -15,6 +15,8 @@ class TestService < Test::Unit::TestCase
     # objects in a central store
     def setup
         @sleeper = nil
+        script = File.join($blinkbase,"examples/root/etc/init.d/sleeper")
+        @status = script + " status"
 
         Blink[:debug] = 1
         assert_nothing_raised() {
@@ -32,46 +34,39 @@ class TestService < Test::Unit::TestCase
     end
 
     def test_process_start
+        # start it
         assert_nothing_raised() {
             @sleeper[:running] = 1
         }
         assert_nothing_raised() {
             @sleeper.retrieve
         }
-        assert_equal(
-            Kernel.system("../examples/root/etc/init.d/sleeper status"),
-            @sleeper.insync?()
-        )
+        assert(!@sleeper.insync?())
         assert_nothing_raised() {
             @sleeper.sync
         }
         assert_nothing_raised() {
             @sleeper.retrieve
         }
-        assert_equal(
-            Kernel.system("../examples/root/etc/init.d/sleeper status"),
-            @sleeper.insync?
-        )
-    end
+        assert(@sleeper.insync?)
 
-    def test_process_evaluate
+        # now stop it
         assert_nothing_raised() {
-            @sleeper[:running] = 1
+            @sleeper[:running] = 0
         }
         assert_nothing_raised() {
-            @sleeper.evaluate
+            @sleeper.retrieve
+        }
+        assert(!@sleeper.insync?())
+        assert_nothing_raised() {
+            @sleeper.sync
         }
-        # it really feels like this should be implicit...
         assert_nothing_raised() {
             @sleeper.retrieve
         }
-        assert_equal(
-            Kernel.system("../examples/root/etc/init.d/sleeper status"),
-            @sleeper.insync?()
-        )
-        assert_equal(
-            true,
-            @sleeper.insync?()
-        )
+        assert(@sleeper.insync?)
+    end
+    def teardown
+        Kernel.system("pkill sleeper")
     end
 end