diff options
Diffstat (limited to 'test/lib/puppettest/exetest.rb')
| -rw-r--r-- | test/lib/puppettest/exetest.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/lib/puppettest/exetest.rb b/test/lib/puppettest/exetest.rb index 0d66c5a07..b0857d19f 100644 --- a/test/lib/puppettest/exetest.rb +++ b/test/lib/puppettest/exetest.rb @@ -27,7 +27,7 @@ module PuppetTest::ExeTest end def setlibdir - ENV["RUBYLIB"] = $:.find_all { |dir| + ENV["RUBYLIB"] = $LOAD_PATH.find_all { |dir| dir =~ /puppet/ or dir =~ /\.\./ }.join(":") end @@ -71,7 +71,7 @@ module PuppetTest::ExeTest output = %x{#{cmd}}.chomp } assert_equal("", output, "Puppetmasterd produced output %s" % output) - assert($? == 0, "Puppetmasterd exit status was %s" % $?) + assert($CHILD_STATUS == 0, "Puppetmasterd exit status was %s" % $CHILD_STATUS) sleep(1) cleanup do @@ -110,7 +110,7 @@ module PuppetTest::ExeTest # we default to mandating that it's running, but teardown # doesn't require that if pid - if pid == $$ + if pid == $PID raise Puppet::Error, "Tried to kill own pid" end begin |