[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 eca338c9fa78e1750bf70c034b1c211d8a0872d3
Author: Markus Roberts <Markus at reality.com>
Date:   Mon Nov 2 19:16:55 2009 -0800

    Fix for #2772 (webrick test failures)
    
    This was my bad.  My patch for #2637 broke some test's assumptions and I
    never went back to update them.
    
    Signed-off-by: Markus Roberts <Markus at reality.com>

diff --git a/spec/unit/network/http/webrick.rb b/spec/unit/network/http/webrick.rb
index 1b76341..fca2e07 100755
--- a/spec/unit/network/http/webrick.rb
+++ b/spec/unit/network/http/webrick.rb
@@ -15,7 +15,7 @@ end
 
 describe Puppet::Network::HTTP::WEBrick, "when turning on listening" do
     before do
-        @mock_webrick = stub('webrick', :[] => {})
+        @mock_webrick = stub('webrick', :[] => {}, :listeners => [])
         [:mount, :start, :shutdown].each {|meth| @mock_webrick.stubs(meth)}
         WEBrick::HTTPServer.stubs(:new).returns(@mock_webrick)
         @server = Puppet::Network::HTTP::WEBrick.new
@@ -162,7 +162,7 @@ end
 
 describe Puppet::Network::HTTP::WEBrick, "when turning off listening" do
     before do
-        @mock_webrick = stub('webrick', :[] => {})
+        @mock_webrick = stub('webrick', :[] => {}, :listeners => [])
         [:mount, :start, :shutdown].each {|meth| @mock_webrick.stubs(meth)}
         WEBrick::HTTPServer.stubs(:new).returns(@mock_webrick)
         @server = Puppet::Network::HTTP::WEBrick.new

-- 
Puppet packaging for Debian