summaryrefslogtreecommitdiffstats
path: root/Lib/test
diff options
context:
space:
mode:
authorVictor Stinner <vstinner@redhat.com>2018-06-27 20:21:53 (GMT)
committerGitHub <noreply@github.com>2018-06-27 20:21:53 (GMT)
commit64737e9ae2081e529935ecf07f44e89f362d1c4b (patch)
treeb6fa94c112542a69dbf3fb880637fd87844561a1 /Lib/test
parentd2cbfffc842b00b5257aa1c25dbcdeb456b6a249 (diff)
downloadcpython-64737e9ae2081e529935ecf07f44e89f362d1c4b.zip
cpython-64737e9ae2081e529935ecf07f44e89f362d1c4b.tar.gz
cpython-64737e9ae2081e529935ecf07f44e89f362d1c4b.tar.bz2
bpo-33913: Fix test_multiprocessing_main_handling (GH-7972)
bpo-30339, bpo-33913: * Increase timeout from 10 seconds to 1 minute in test_source_main_skipped_in_children source of test_multiprocessing_main_handling. * Replace time.time() with time.monotonic(). * On timeout, include the duration in the error message.
Diffstat (limited to 'Lib/test')
-rw-r--r--Lib/test/test_multiprocessing_main_handling.py16
1 files changed, 10 insertions, 6 deletions
diff --git a/Lib/test/test_multiprocessing_main_handling.py b/Lib/test/test_multiprocessing_main_handling.py
index fd93184..9fd5c9f 100644
--- a/Lib/test/test_multiprocessing_main_handling.py
+++ b/Lib/test/test_multiprocessing_main_handling.py
@@ -57,11 +57,13 @@ if __name__ == '__main__':
p = Pool(5)
results = []
p.map_async(f, [1, 2, 3], callback=results.extend)
- deadline = time.time() + 60 # up to 60 s to report the results
+ start_time = time.monotonic()
while not results:
time.sleep(0.05)
- if time.time() > deadline:
- raise RuntimeError("Timed out waiting for results")
+ # up to 1 min to report the results
+ dt = time.monotonic() - start_time
+ if dt > 60.0:
+ raise RuntimeError("Timed out waiting for results (%.1f sec)" % dt)
results.sort()
print(start_method, "->", results)
"""
@@ -85,11 +87,13 @@ set_start_method(start_method)
p = Pool(5)
results = []
p.map_async(int, [1, 4, 9], callback=results.extend)
-deadline = time.time() + 10 # up to 10 s to report the results
+start_time = time.monotonic()
while not results:
time.sleep(0.05)
- if time.time() > deadline:
- raise RuntimeError("Timed out waiting for results")
+ # up to 1 min to report the results
+ dt = time.monotonic() - start_time
+ if dt > 60.0:
+ raise RuntimeError("Timed out waiting for results (%.1f sec)" % dt)
results.sort()
print(start_method, "->", results)
"""