summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Roberts <Markus@reality.com>2009-11-02 19:16:55 -0800
committerJames Turnbull <james@lovedthanlost.net>2009-11-05 13:50:25 +1100
commiteca338c9fa78e1750bf70c034b1c211d8a0872d3 (patch)
tree3795a6c4a215822e3031b12d353b85b8824372f5
parentb1c57e9c15b1b7f079dc99dfc79e57fe3e5682e0 (diff)
downloadpuppet-eca338c9fa78e1750bf70c034b1c211d8a0872d3.tar.gz
puppet-eca338c9fa78e1750bf70c034b1c211d8a0872d3.tar.xz
puppet-eca338c9fa78e1750bf70c034b1c211d8a0872d3.zip
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@reality.com>
-rwxr-xr-xspec/unit/network/http/webrick.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/unit/network/http/webrick.rb b/spec/unit/network/http/webrick.rb
index 1b76341ba..fca2e075e 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