[3.7] bpo-37531: Fix regrtest timeout for subprocesses (GH-15072) by vstinner · Pull Request #15280 · python/cpython

Expand Up @@ -13,7 +13,7 @@
from test.libregrtest.runtest import ( runtest, INTERRUPTED, CHILD_ERROR, PROGRESS_MIN_TIME, format_test_result, TestResult, is_failed) format_test_result, TestResult, is_failed, TIMEOUT) from test.libregrtest.setup import setup_tests from test.libregrtest.utils import format_duration
Expand Down Expand Up @@ -103,11 +103,12 @@ class ExitThread(Exception):

class MultiprocessThread(threading.Thread): def __init__(self, pending, output, ns): def __init__(self, pending, output, ns, timeout): super().__init__() self.pending = pending self.output = output self.ns = ns self.timeout = timeout self.current_test_name = None self.start_time = None self._popen = None Expand All @@ -126,6 +127,12 @@ def __repr__(self): return '<%s>' % ' '.join(info)
def kill(self): """ Kill the current process (if any).
This method can be called by the thread running the process, or by another thread. """ self._killed = True
popen = self._popen Expand All @@ -136,6 +143,13 @@ def kill(self): # does not hang popen.stdout.close() popen.stderr.close() popen.wait()
def mp_result_error(self, test_name, error_type, stdout='', stderr='', err_msg=None): test_time = time.monotonic() - self.start_time result = TestResult(test_name, error_type, test_time, None) return MultiprocessResult(result, stdout, stderr, err_msg)
def _runtest(self, test_name): try: Expand All @@ -154,7 +168,19 @@ def _runtest(self, test_name): raise ExitThread
try: stdout, stderr = popen.communicate(timeout=self.timeout) except subprocess.TimeoutExpired: if self._killed: # kill() has been called: communicate() fails # on reading closed stdout/stderr raise ExitThread
popen.kill() stdout, stderr = popen.communicate() self.kill()
return self.mp_result_error(test_name, TIMEOUT, stdout, stderr) except OSError: if self._killed: # kill() has been called: communicate() fails Expand All @@ -163,7 +189,6 @@ def _runtest(self, test_name): raise except: self.kill() popen.wait() raise
retcode = popen.wait() Expand Down Expand Up @@ -191,8 +216,7 @@ def _runtest(self, test_name): err_msg = "Failed to parse worker JSON: %s" % exc
if err_msg is not None: test_time = time.monotonic() - self.start_time result = TestResult(test_name, CHILD_ERROR, test_time, None) return self.mp_result_error(test_name, CHILD_ERROR, stdout, stderr, err_msg)
return MultiprocessResult(result, stdout, stderr, err_msg)
Expand Down Expand Up @@ -236,13 +260,16 @@ def __init__(self, regrtest): self.output = queue.Queue() self.pending = MultiprocessIterator(self.regrtest.tests) if self.ns.timeout is not None: self.test_timeout = self.ns.timeout * 1.5 self.worker_timeout = self.ns.timeout * 1.5 self.main_timeout = self.ns.timeout * 2.0 else: self.test_timeout = None self.worker_timeout = None self.main_timeout = None self.workers = None
def start_workers(self): self.workers = [MultiprocessThread(self.pending, self.output, self.ns) self.workers = [MultiprocessThread(self.pending, self.output, self.ns, self.worker_timeout) for _ in range(self.ns.use_mp)] print("Run tests in parallel using %s child processes" % len(self.workers)) Expand Down Expand Up @@ -274,8 +301,8 @@ def _get_result(self): return None
while True: if self.test_timeout is not None: faulthandler.dump_traceback_later(self.test_timeout, exit=True) if self.main_timeout is not None: faulthandler.dump_traceback_later(self.main_timeout, exit=True)
# wait for a thread timeout = max(PROGRESS_UPDATE, PROGRESS_MIN_TIME) Expand Down Expand Up @@ -343,7 +370,7 @@ def run_tests(self): print() self.regrtest.interrupted = True finally: if self.test_timeout is not None: if self.main_timeout is not None: faulthandler.cancel_dump_traceback_later()
# a test failed (and --failfast is set) or all tests completed Expand Down