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 <[email protected]> --- 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 b5a3f96..27b0f52 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) -- 1.6.5 -- You received this message because you are subscribed to the Google Groups "Puppet Developers" group. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/puppet-dev?hl=en.
