summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorNick Lewis <nick@puppetlabs.com>2011-07-19 15:19:10 -0700
committerNick Lewis <nick@puppetlabs.com>2011-07-19 15:47:03 -0700
commit185a666018c0cf0b2c497f655f942a82cd22e49e (patch)
tree79210fb8bfcd0df1350b115f4c52480e41874337 /test
parent21c5929aae899e559e9a813c48424da4fcbec54b (diff)
downloadpuppet-185a666018c0cf0b2c497f655f942a82cd22e49e.tar.gz
puppet-185a666018c0cf0b2c497f655f942a82cd22e49e.tar.xz
puppet-185a666018c0cf0b2c497f655f942a82cd22e49e.zip
Remove Puppet::Network::HttpPool keep_alive handling
Keep alive has been disabled since 2008, and seems to have caused problems when it was enabled before then. Since there doesn't seem to be any push to get it working again, just remove it to simplify this code. This also allows us to entirely remove the usage of Puppet::Util::Cacher from HttpPool. Paired-With: Jacob Helwig <jacob@puppetlabs.com>
Diffstat (limited to 'test')
-rwxr-xr-xtest/network/server/webrick.rb1
-rwxr-xr-xtest/ral/type/filesources.rb1
2 files changed, 0 insertions, 2 deletions
diff --git a/test/network/server/webrick.rb b/test/network/server/webrick.rb
index 624147b6c..9eed5d862 100755
--- a/test/network/server/webrick.rb
+++ b/test/network/server/webrick.rb
@@ -16,7 +16,6 @@ class TestWebrickServer < Test::Unit::TestCase
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
diff --git a/test/ral/type/filesources.rb b/test/ral/type/filesources.rb
index 3363aafb3..f39d53907 100755
--- a/test/ral/type/filesources.rb
+++ b/test/ral/type/filesources.rb
@@ -26,7 +26,6 @@ class TestFileSources < Test::Unit::TestCase
def teardown
super
- Puppet::Network::HttpPool.clear_http_instances
end
def use_storage