Accepting the patch from #190.

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

1 files changed, 2 insertions, 6 deletions

diff --git a/test/client/master.rb b/test/client/master.rb
index 7e447b095..89873791d 100644
--- a/test/client/master.rb
+++ b/test/client/master.rb
@@ -98,8 +98,8 @@ class TestMasterClient < Test::Unit::TestCase
         assert_nothing_raised do
             client.lock do
                 pid = nil
-                assert(pid = client.locked?, "Client is not locked")
-                assert(pid =~ /^\d+$/, "PID is, um, not a pid")
+                assert(client.locked?, "Client is not locked")
+                assert(client.lockpid.is_a?(Integer), "PID #{client.lockpid} is, um, not a pid")
             end
         end
         assert(! client.locked?)
@@ -118,24 +118,20 @@ class TestMasterClient < Test::Unit::TestCase
 
     # Make sure non-string facts don't make things go kablooie
     def test_nonstring_facts
-        Puppet.err :a
         # Add a nonstring fact
         Facter.add("nonstring") do
             setcode { 1 }
         end
-        Puppet.err :b
 
         assert_equal(1, Facter.nonstring, "Fact was a string from facter")
 
         client = mkclient()
 
         assert(! FileTest.exists?(@createdfile))
-        Puppet.err :c
 
         assert_nothing_raised {
             client.run
         }
-        Puppet.err :d
     end
 
     def test_getplugins