diff options
| author | Benjamin Peterson <benjamin@python.org> | 2011-05-23 21:29:50 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2011-05-23 21:29:50 (GMT) |
| commit | 200fe3d747fe8da9a5043632dad435b33c492439 (patch) | |
| tree | 484d738b47a7cb9e7dafcf065668357ef5558c7a /Lib | |
| parent | f5fcd33be9b21b148774d3fa2832bb0627e94809 (diff) | |
| parent | a2a895c46c8e838a29308dd0da7ab1d364ff4495 (diff) | |
| download | cpython-200fe3d747fe8da9a5043632dad435b33c492439.zip cpython-200fe3d747fe8da9a5043632dad435b33c492439.tar.gz cpython-200fe3d747fe8da9a5043632dad435b33c492439.tar.bz2 | |
merge heads
Diffstat (limited to 'Lib')
| -rwxr-xr-x | Lib/test/regrtest.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py index e2e3765..a8726b5 100755 --- a/Lib/test/regrtest.py +++ b/Lib/test/regrtest.py @@ -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 |