mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-03 00:23:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Issue #25220: truncate some long lines in libregrtest/*.py

Browse source
This commit is contained in:
Victor Stinner 2015-09-29 23:43:33 +02:00
parent 37554525aa
commit 6448b8041a
2 changed files with 24 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -103,20 +103,23 @@ class MultiprocessThread(threading.Thread):
except StopIteration:
self.output.put((None, None, None, None))
return
retcode, stdout, stderr = run_tests_in_subprocess(test, self.ns)
retcode, stdout, stderr = run_tests_in_subprocess(test,
self.ns)
# Strip last refcount output line if it exists, since it
# comes from the shutdown of the interpreter in the subcommand.
stderr = debug_output_pat.sub("", stderr)
stdout, _, result = stdout.strip().rpartition("\n")
if retcode != 0:
result = (CHILD_ERROR, "Exit code %s" % retcode)
self.output.put((test, stdout.rstrip(), stderr.rstrip(), result))
self.output.put((test, stdout.rstrip(), stderr.rstrip(),
result))
return
if not result:
self.output.put((None, None, None, None))
return
result = json.loads(result)
self.output.put((test, stdout.rstrip(), stderr.rstrip(), result))
self.output.put((test, stdout.rstrip(), stderr.rstrip(),
result))
except BaseException:
self.output.put((None, None, None, None))
raise
@ -149,7 +152,8 @@ def run_tests_multiprocess(regrtest):
if result[0] == INTERRUPTED:
raise KeyboardInterrupt
if result[0] == CHILD_ERROR:
raise Exception("Child error on {}: {}".format(test, result[1]))
msg = "Child error on {}: {}".format(test, result[1])
raise Exception(msg)
test_index += 1
except KeyboardInterrupt:
regrtest.interrupted = True