merge 3.4

This commit is contained in:
Benjamin Peterson 2014-12-13 16:13:31 -05:00
commit 2a7d05a9f2
1 changed files with 1 additions and 0 deletions

View File

@ -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,