Skip to content
Permalink
Browse files

bpo-37531: Fix regrtest _timedout() function on timeout (GH-15419)

Fix code handling TimeoutExpired exception in _timedout().
  • Loading branch information...
vstinner committed Aug 23, 2019
1 parent c486825 commit 767434c39c8f3c6a8af1b3282d8382ccf809fe21
Showing with 2 additions and 2 deletions.
  1. +2 −2 Lib/test/libregrtest/runtest_mp.py
@@ -184,14 +184,14 @@ def mp_result_error(self, test_name, error_type, stdout='', stderr='',
def _timedout(self, test_name):
self._kill()

stdout = sterr = ''
stdout = stderr = ''
popen = self._popen
try:
stdout, stderr = popen.communicate(timeout=JOIN_TIMEOUT)
except (subprocess.TimeoutExpired, OSError) as exc:
print("WARNING: Failed to read worker process %s output "
"(timeout=%.1f sec): %r"
% (popen.pid, exc, timeout),
% (popen.pid, JOIN_TIMEOUT, exc),
file=sys.stderr, flush=True)

self._close_wait()

0 comments on commit 767434c

Please sign in to comment.
You can’t perform that action at this time.