summaryrefslogtreecommitdiffstats
path: root/Lib/test/test_httplib.py
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2014-12-13 21:13:31 (GMT)
committerBenjamin Peterson <benjamin@python.org>2014-12-13 21:13:31 (GMT)
commit2a7d05a9f2ab15b8e0e5bf024e230748681ec72b (patch)
tree88e09721318a6b420003aca359d718ad68c761bd /Lib/test/test_httplib.py
parent7ced53cc636e6c6b63a8918b11f6f69fc64b0d33 (diff)
parent9566de18e60268c0899c797292dc6c467f6f6531 (diff)
downloadcpython-2a7d05a9f2ab15b8e0e5bf024e230748681ec72b.zip
cpython-2a7d05a9f2ab15b8e0e5bf024e230748681ec72b.tar.gz
cpython-2a7d05a9f2ab15b8e0e5bf024e230748681ec72b.tar.bz2
merge 3.4
Diffstat (limited to 'Lib/test/test_httplib.py')
-rw-r--r--Lib/test/test_httplib.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/Lib/test/test_httplib.py b/Lib/test/test_httplib.py
index a4d0c8f..6261276 100644
--- a/Lib/test/test_httplib.py
+++ b/Lib/test/test_httplib.py
@@ -1314,6 +1314,7 @@ class TunnelTests(TestCase):
self.assertTrue(b'CONNECT destination.com' in conn.sock.data)
self.assertTrue(b'Host: destination.com' in conn.sock.data)
+@support.reap_threads
def test_main(verbose=None):
support.run_unittest(HeaderTests, OfflineTest, BasicTest, TimeoutTest,
HTTPSTest, RequestBodyTest, SourceAddressTest,