summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorNick Lewis <nick@puppetlabs.com>2011-07-19 15:57:39 -0700
committerNick Lewis <nick@puppetlabs.com>2011-07-19 15:57:39 -0700
commite8a2287cdac5dbf086b60af65e301f3e2360ee2b (patch)
tree1c565e2c754f3cb43f4e0dc8fa7bb5e81a40d064 /test
parentc1e83597712f4553960b42aebc3ab45ae272e724 (diff)
parent185a666018c0cf0b2c497f655f942a82cd22e49e (diff)
downloadpuppet-e8a2287cdac5dbf086b60af65e301f3e2360ee2b.tar.gz
puppet-e8a2287cdac5dbf086b60af65e301f3e2360ee2b.tar.xz
puppet-e8a2287cdac5dbf086b60af65e301f3e2360ee2b.zip
Merge branch 'remove-http-pool-keep-alive'
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