From 0d63bacefd2e5b937ec6b0ec3053777c09941b4a Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Wed, 11 Dec 2019 11:30:03 +0100 Subject: bpo-38614: Use test.support.SHORT_TIMEOUT constant (GH-17566) Replace hardcoded timeout constants in tests with SHORT_TIMEOUT of test.support, so it's easier to ajdust this timeout for all tests at once. SHORT_TIMEOUT is 30 seconds by default, but it can be longer depending on --timeout command line option. The change makes almost all timeouts longer, except test_reap_children() of test_support which is made 2x shorter: SHORT_TIMEOUT should be enough. If this test starts to fail, LONG_TIMEOUT should be used instead. Uniformize also "from test import support" import in some test files. --- Lib/test/test_support.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Lib/test/test_support.py') diff --git a/Lib/test/test_support.py b/Lib/test/test_support.py index eb27c0cf866..2f347bd540f 100644 --- a/Lib/test/test_support.py +++ b/Lib/test/test_support.py @@ -422,7 +422,7 @@ class TestSupport(unittest.TestCase): os._exit(0) t0 = time.monotonic() - deadline = time.monotonic() + 60.0 + deadline = time.monotonic() + support.SHORT_TIMEOUT was_altered = support.environment_altered try: -- cgit v1.2.3