summaryrefslogtreecommitdiffstats
path: root/spec/integration/bin/puppetmasterd.rb
diff options
context:
space:
mode:
Diffstat (limited to 'spec/integration/bin/puppetmasterd.rb')
-rwxr-xr-xspec/integration/bin/puppetmasterd.rb5
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)