diff options
author | Luke Kanies <luke@madstop.com> | 2007-12-19 11:42:22 -0600 |
---|---|---|
committer | Luke Kanies <luke@madstop.com> | 2007-12-19 11:42:22 -0600 |
commit | 553b2ad8add20cd629fcd90b512d97d4edd7e481 (patch) | |
tree | 23acf8bf35ad697565647dac9c387d843552ba58 /test/network/server/webrick.rb | |
parent | 5252f02dba8ef35db77ecb2d9bf711c1fd0b0bb2 (diff) | |
download | puppet-553b2ad8add20cd629fcd90b512d97d4edd7e481.tar.gz puppet-553b2ad8add20cd629fcd90b512d97d4edd7e481.tar.xz puppet-553b2ad8add20cd629fcd90b512d97d4edd7e481.zip |
Entirely refactoring http keep-alive. There's now
a central module responsible for managing the http pool
(Puppet::Network::HttpPool), and it also handles
setting certificate information. This gets rid of
what were otherwise long chains of method calls,
and it makes the code paths much clearer.
Diffstat (limited to 'test/network/server/webrick.rb')
-rwxr-xr-x | test/network/server/webrick.rb | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/test/network/server/webrick.rb b/test/network/server/webrick.rb index 3561cd41a..d3408c166 100755 --- a/test/network/server/webrick.rb +++ b/test/network/server/webrick.rb @@ -14,6 +14,11 @@ class TestWebrickServer < Test::Unit::TestCase super end + def teardown + super + Puppet::Network::HttpPool.clear_http_instances + end + # Make sure we can create a server, and that it knows how to create its # certs by default. def test_basics @@ -102,7 +107,7 @@ class TestWebrickServer < Test::Unit::TestCase assert_nothing_raised() { client = Puppet::Network::Client.status.new( - :Server => Facter.value(:fqdn), + :Server => "localhost", :Port => @@port ) } @@ -111,6 +116,7 @@ class TestWebrickServer < Test::Unit::TestCase def mk_status_server server = nil + Puppet[:certdnsnames] = "localhost" assert_nothing_raised() { server = Puppet::Network::HTTPServer::WEBrick.new( :Port => @@port, |