[Python-checkins] cpython: Issue #27787: Remove test_main() and hard-coded list of test classes
martin.panter
python-checkins at python.org
Tue Aug 23 06:49:07 EDT 2016
https://hg.python.org/cpython/rev/1f73355afebb
changeset: 102855:1f73355afebb
user: Martin Panter <vadmium+py at gmail.com>
date: Tue Aug 23 09:01:43 2016 +0000
summary:
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.
files:
Lib/test/test_httplib.py | 11 ++---------
1 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/Lib/test/test_httplib.py b/Lib/test/test_httplib.py
--- a/Lib/test/test_httplib.py
+++ b/Lib/test/test_httplib.py
@@ -940,6 +940,7 @@
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 @@
finally:
response.close()
conn.close()
- thread.join()
+ thread.join()
self.assertEqual(result, b"proxied data\n")
class ExtendedReadTest(TestCase):
@@ -1711,13 +1712,5 @@
self.assertIn('header: {}'.format(expected_header), lines)
- at 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()
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list