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.
This commit is contained in:
parent
9ae505041f
commit
1fa6915427
|
@ -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()
|
||||
|
|
Loading…
Reference in New Issue