From: Martin Panter <vadmium+py@gmail.com>
Date: Tue, 23 Aug 2016 09:01:43 +0000 (+0000)
Subject: Issue #27787: Remove test_main() and hard-coded list of test classes
X-Git-Tag: v3.6.0b1~588
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1fa69154270c3ad41e8abfbc399128f31c41a63a;p=python

Issue #27787: Remove test_main() and hard-coded list of test classes

The @reap_threads decorator made the test wait (for up to 1 s) until
background threads have finished.  Calling join() with a timeout should be
equivalent.
---

diff --git a/Lib/test/test_httplib.py b/Lib/test/test_httplib.py
index f45e352d6a..5c500cbc46 100644
--- a/Lib/test/test_httplib.py
+++ b/Lib/test/test_httplib.py
@@ -940,6 +940,7 @@ class BasicTest(TestCase):
 
         thread = threading.Thread(target=run_server)
         thread.start()
+        self.addCleanup(thread.join, float(1))
         conn = client.HTTPConnection(*serv.getsockname())
         conn.request("CONNECT", "dummy:1234")
         response = conn.getresponse()
@@ -953,7 +954,7 @@ class BasicTest(TestCase):
         finally:
             response.close()
             conn.close()
-            thread.join()
+        thread.join()
         self.assertEqual(result, b"proxied data\n")
 
 class ExtendedReadTest(TestCase):
@@ -1711,13 +1712,5 @@ class TunnelTests(TestCase):
         self.assertIn('header: {}'.format(expected_header), lines)
 
 
-@support.reap_threads
-def test_main(verbose=None):
-    support.run_unittest(HeaderTests, OfflineTest, BasicTest, TimeoutTest,
-                         PersistenceTest,
-                         HTTPSTest, RequestBodyTest, SourceAddressTest,
-                         HTTPResponseTest, ExtendedReadTest,
-                         ExtendedReadTestChunked, TunnelTests)
-
 if __name__ == '__main__':
     test_main()