traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

regrtest.py checks that child process exit code is zero

This commit is contained in:
Victor Stinner 2011-03-31 18:02:36 +02:00
parent 28346b8077
commit 4b73988122
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Lib/test/regrtest.py
View File

@ -216,6 +216,7 @@ ENV_CHANGED = -1
SKIPPED = -2 SKIPPED = -2
RESOURCE_DENIED = -3 RESOURCE_DENIED = -3
INTERRUPTED = -4 INTERRUPTED = -4
CHILD_ERROR = -5 # error in a child process
from test import support from test import support
@ -579,10 +580,15 @@ def main(tests=None, testdir=None, verbose=0, quiet=False,
universal_newlines=True, universal_newlines=True,
close_fds=(os.name != 'nt')) close_fds=(os.name != 'nt'))
stdout, stderr = popen.communicate() stdout, stderr = popen.communicate()
retcode = popen.wait()
# Strip last refcount output line if it exists, since it # Strip last refcount output line if it exists, since it
# comes from the shutdown of the interpreter in the subcommand. # comes from the shutdown of the interpreter in the subcommand.
stderr = debug_output_pat.sub("", stderr) stderr = debug_output_pat.sub("", stderr)
stdout, _, result = stdout.strip().rpartition("\n") stdout, _, result = stdout.strip().rpartition("\n")
if retcode != 0:
result = (CHILD_ERROR, "Exit code %s" % retcode)
output.put((test, stdout.rstrip(), stderr.rstrip(), result))
return
if not result: if not result:
output.put((None, None, None, None)) output.put((None, None, None, None))
return return
@ -612,6 +618,8 @@ def main(tests=None, testdir=None, verbose=0, quiet=False,
if result[0] == INTERRUPTED: if result[0] == INTERRUPTED:
assert result[1] == 'KeyboardInterrupt' assert result[1] == 'KeyboardInterrupt'
raise KeyboardInterrupt # What else? raise KeyboardInterrupt # What else?
if result[0] == CHILD_ERROR:
raise Exception(result[1])
accumulate_result(test, result) accumulate_result(test, result)
test_index += 1 test_index += 1
except KeyboardInterrupt: except KeyboardInterrupt: