merge 3.4

2a7d05a9 · Benjamin Peterson · 7ced53cc · 9566de18 · 2a7d05a9
Kaydet (Commit) 2a7d05a9 authored Ara 13, 2014 tarafından Benjamin Peterson
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

test_httplib.py Lib/test/test_httplib.py +1 -0

No files found.
--- 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,