diff options
| author | Jesse Wolfe <jes5199@gmail.com> | 2009-12-18 12:36:42 -0800 |
|---|---|---|
| committer | James Turnbull <james@lovedthanlost.net> | 2009-12-19 08:56:34 +1100 |
| commit | 037b99a27dc8b2aeb44c5cdfb20bfef672294405 (patch) | |
| tree | fe2c23d5dc9525f3541b45079bf129ea6c7ecd2e | |
| parent | d11c7503cc816e98b5deb890b49a7e8c47173e1b (diff) | |
| download | puppet-037b99a27dc8b2aeb44c5cdfb20bfef672294405.tar.gz puppet-037b99a27dc8b2aeb44c5cdfb20bfef672294405.tar.xz puppet-037b99a27dc8b2aeb44c5cdfb20bfef672294405.zip | |
Fixing #2958 inconsistent errors in spec/integration/bin/puppetmasterd.rb
I was getting inconsistent errors in this file, and it's really two
separate issues but they're both trivial.
1) The spec launches ./sbin/puppetmasterd, which may have trouble
finding the puppet libraries. It could even load the system-installed
puppet rather than the files in the repository -- I think this effect is
why the tests were passing on Markus's machine, for example.
2) There's a race condition in this test, and puppetmasterd has gotten
slower to start up (perhaps due to the #2877 fix?)
Signed-off-by: Jesse Wolfe <jes5199@gmail.com>
| -rwxr-xr-x | spec/integration/bin/puppetmasterd.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/spec/integration/bin/puppetmasterd.rb b/spec/integration/bin/puppetmasterd.rb index b5a3f96da..27b0f52bf 100755 --- a/spec/integration/bin/puppetmasterd.rb +++ b/spec/integration/bin/puppetmasterd.rb @@ -51,7 +51,8 @@ describe "puppetmasterd" do args = arguments + addl_args bin = File.join(File.dirname(__FILE__), "..", "..", "..", "sbin", "puppetmasterd") - output = %x{#{bin} #{args}}.chomp + lib = File.join(File.dirname(__FILE__), "..", "..", "..", "lib") + output = %x{/usr/bin/env ruby -I #{lib} #{bin} #{args}}.chomp end def stop @@ -72,7 +73,7 @@ describe "puppetmasterd" do it "should be serving status information over xmlrpc" do start - sleep 0.5 + sleep 5 client = Puppet::Network::Client.status.new(:Server => "localhost", :Port => @@port) |