mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-10 11:00:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

regrtest: add timeout to main process when using -jN

Browse source 
libregrtest: add a watchdog to run_tests_multiprocess() using
faulthandler.dump_traceback_later().
This commit is contained in:
Victor Stinner 2016-03-23 02:04:32 +01:00
parent e98445a4de
commit 6d7f4f6675
1 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Lib/test/libregrtest/runtest_mp.py
View file

@ -1,3 +1,4 @@
import faulthandler
import json import json
import os import os
import queue import queue
@ -151,6 +152,8 @@ class MultiprocessThread(threading.Thread):
def run_tests_multiprocess(regrtest): def run_tests_multiprocess(regrtest):
output = queue.Queue() output = queue.Queue()
pending = MultiprocessIterator(regrtest.tests) pending = MultiprocessIterator(regrtest.tests)
test_timeout = regrtest.ns.timeout
use_timeout = (test_timeout is not None)
workers = [MultiprocessThread(pending, output, regrtest.ns) workers = [MultiprocessThread(pending, output, regrtest.ns)
for i in range(regrtest.ns.use_mp)] for i in range(regrtest.ns.use_mp)]
@ -170,11 +173,14 @@ def run_tests_multiprocess(regrtest):
finished = 0 finished = 0
test_index = 1 test_index = 1
timeout = max(PROGRESS_UPDATE, PROGRESS_MIN_TIME) get_timeout = max(PROGRESS_UPDATE, PROGRESS_MIN_TIME)
try: try:
while finished < regrtest.ns.use_mp: while finished < regrtest.ns.use_mp:
if use_timeout:
faulthandler.dump_traceback_later(test_timeout, exit=True)
try: try:
item = output.get(timeout=timeout) item = output.get(timeout=get_timeout)
except queue.Empty: except queue.Empty:
running = get_running(workers) running = get_running(workers)
if running and not regrtest.ns.pgo: if running and not regrtest.ns.pgo:
@ -215,6 +221,9 @@ def run_tests_multiprocess(regrtest):
regrtest.interrupted = True regrtest.interrupted = True
pending.interrupted = True pending.interrupted = True
print() print()
finally:
if use_timeout:
faulthandler.cancel_dump_traceback_later()
running = [worker.current_test for worker in workers] running = [worker.current_test for worker in workers]
running = list(filter(bool, running)) running = list(filter(bool, running))