summaryrefslogtreecommitdiffstats
path: root/spec/integration/network
diff options
context:
space:
mode:
authorLuke Kanies <luke@madstop.com>2008-04-15 21:33:49 -0500
committerLuke Kanies <luke@madstop.com>2008-04-15 21:33:49 -0500
commitef7d914aee89b6ea023f030350d04923a7b63fd2 (patch)
tree4f7123d5d01bdaee4e6b27586b0674963fe550b5 /spec/integration/network
parent0ca0ef63d5e38de2926e14ca616cef03250e2a79 (diff)
downloadpuppet-ef7d914aee89b6ea023f030350d04923a7b63fd2.tar.gz
puppet-ef7d914aee89b6ea023f030350d04923a7b63fd2.tar.xz
puppet-ef7d914aee89b6ea023f030350d04923a7b63fd2.zip
Oops; final fix on the integration test failures resulting
from my partial support for ssl in webrick.
Diffstat (limited to 'spec/integration/network')
-rw-r--r--spec/integration/network/server/webrick.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/spec/integration/network/server/webrick.rb b/spec/integration/network/server/webrick.rb
index 0ab8d89e4..61ccb09aa 100644
--- a/spec/integration/network/server/webrick.rb
+++ b/spec/integration/network/server/webrick.rb
@@ -7,6 +7,10 @@ describe Puppet::Network::Server do
before :each do
Puppet[:servertype] = 'webrick'
@params = { :address => "127.0.0.1", :port => 34343, :handlers => [ :node ] }
+
+ # LAK:NOTE (4/08) Stub the ssl support for now; we'll remove it once it's actually
+ # functional.
+ Puppet::Network::HTTP::WEBrick.any_instance.stubs(:setup_ssl).returns({})
end
describe "before listening" do
@@ -43,4 +47,4 @@ describe Puppet::Network::Server do
end
end
end
-end \ No newline at end of file
+end