mirrors/cpython
0
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2024-11-24 10:24:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Fix code handling TimeoutExpired exception in _timedout().
This commit is contained in:
Victor Stinner 2019-08-23 11:27:24 +01:00 committed by GitHub
parent c48682509d
commit 767434c39c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Lib/test/libregrtest/runtest_mp.py
View File

@ -184,14 +184,14 @@ class MultiprocessThread(threading.Thread):
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()