mirror of
https://github.com/python/cpython.git
synced 2025-12-09 18:48:05 +00:00
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.
This commit is contained in:
parent
b7a0109cd2
commit
0d63bacefd
19 changed files with 73 additions and 65 deletions
|
|
@ -644,7 +644,7 @@ class SiginterruptTest(unittest.TestCase):
|
|||
# wait until the child process is loaded and has started
|
||||
first_line = process.stdout.readline()
|
||||
|
||||
stdout, stderr = process.communicate(timeout=5.0)
|
||||
stdout, stderr = process.communicate(timeout=support.SHORT_TIMEOUT)
|
||||
except subprocess.TimeoutExpired:
|
||||
process.kill()
|
||||
return False
|
||||
|
|
@ -1192,7 +1192,7 @@ class StressTest(unittest.TestCase):
|
|||
self.setsig(signal.SIGALRM, second_handler) # for ITIMER_REAL
|
||||
|
||||
expected_sigs = 0
|
||||
deadline = time.monotonic() + 15.0
|
||||
deadline = time.monotonic() + support.SHORT_TIMEOUT
|
||||
|
||||
while expected_sigs < N:
|
||||
os.kill(os.getpid(), signal.SIGPROF)
|
||||
|
|
@ -1226,7 +1226,7 @@ class StressTest(unittest.TestCase):
|
|||
self.setsig(signal.SIGALRM, handler) # for ITIMER_REAL
|
||||
|
||||
expected_sigs = 0
|
||||
deadline = time.monotonic() + 15.0
|
||||
deadline = time.monotonic() + support.SHORT_TIMEOUT
|
||||
|
||||
while expected_sigs < N:
|
||||
# Hopefully the SIGALRM will be received somewhere during
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue