Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

merge heads

This commit is contained in:
Benjamin Peterson 2011-05-23 16:29:50 -05:00
parent f5fcd33be9 a2a895c46c
commit 200fe3d747
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Lib/test/regrtest.py
View File

@ -580,9 +580,11 @@ def main(tests=None, testdir=None, verbose=0, quiet=False,
if test is None:
finished += 1
continue
accumulate_result(test, result)
if not quiet:
print("[{1:{0}}{2}] {3}".format(
test_count_width, test_index, test_count, test))
print("[{1:{0}}{2}/{3}] {4}".format(
test_count_width, test_index, test_count,
len(bad), test))
if stdout:
print(stdout)
if stderr:
@ -590,7 +592,6 @@ def main(tests=None, testdir=None, verbose=0, quiet=False,
if result[0] == INTERRUPTED:
assert result[1] == 'KeyboardInterrupt'
raise KeyboardInterrupt # What else?
accumulate_result(test, result)
test_index += 1
except KeyboardInterrupt:
interrupted = True
@ -600,8 +601,8 @@ def main(tests=None, testdir=None, verbose=0, quiet=False,
else:
for test_index, test in enumerate(tests, 1):
if not quiet:
print("[{1:{0}}{2}] {3}".format(
test_count_width, test_index, test_count, test))
print("[{1:{0}}{2}/{3}] {4}".format(
test_count_width, test_index, test_count, len(bad), test))
sys.stdout.flush()
if trace:
# If we're tracing code coverage, then we don't exit with status