[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, upstream, updated. puppet-0.24.5-rc3-1601-gf8c1b08

[James Turnbull]

The following commit has been merged in the upstream branch:
commit 037b99a27dc8b2aeb44c5cdfb20bfef672294405
Author: Jesse Wolfe <jes5199 at gmail.com>
Date:   Fri Dec 18 12:36:42 2009 -0800

    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 at gmail.com>

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)
 

-- 
Puppet packaging for Debian