From: Victor Stinner <vstinner@redhat.com>
Date: Fri, 23 Aug 2019 10:27:24 +0000 (+0100)
Subject: bpo-37531: Fix regrtest _timedout() function on timeout (GH-15419)
X-Git-Tag: v3.9.0a1~812
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=767434c39c8f3c6a8af1b3282d8382ccf809fe21;p=thirdparty%2FPython%2Fcpython.git

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

Fix code handling TimeoutExpired exception in _timedout().
---

diff --git a/Lib/test/libregrtest/runtest_mp.py b/Lib/test/libregrtest/runtest_mp.py
index c22479b7976f..c5ac6e090376 100644
--- a/Lib/test/libregrtest/runtest_mp.py
+++ b/Lib/test/libregrtest/runtest_mp.py
@@ -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()