[Python-checkins] cpython (merge 3.2 -> 3.2): merge heads

[benjamin.peterson]

http://hg.python.org/cpython/rev/e2e21a76178c
changeset:   70315:e2e21a76178c
branch:      3.2
parent:      70313:19ffce6ea323
parent:      70309:2da7577fa393
user:        Benjamin Peterson <benjamin at python.org>
date:        Mon May 23 16:29:50 2011 -0500
summary:
  merge heads

files:
  Lib/test/regrtest.py |  11 ++++++-----
  1 files changed, 6 insertions(+), 5 deletions(-)


diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py
--- a/Lib/test/regrtest.py
+++ b/Lib/test/regrtest.py
@@ -580,9 +580,11 @@
                 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 @@
                 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 @@
     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

-- 
Repository URL: http://hg.python.org/cpython