summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2011-05-23 22:03:33 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2011-05-23 22:03:33 (GMT)
commita9100721e9057d6332a5e5c97e134d80173aedd0 (patch)
tree2101b5c6abbd0fa84550410abbf7cfff94b0643e
parent3ef1229b14ef901d19a0a9cc4a4ec70100638b36 (diff)
parent64af7c0d36ae78881b127643052d43316da9f52c (diff)
downloadcpython-a9100721e9057d6332a5e5c97e134d80173aedd0.zip
cpython-a9100721e9057d6332a5e5c97e134d80173aedd0.tar.gz
cpython-a9100721e9057d6332a5e5c97e134d80173aedd0.tar.bz2
Merge heads.
-rwxr-xr-xLib/test/regrtest.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py
index ccbe6f9..04e87e3 100755
--- a/Lib/test/regrtest.py
+++ b/Lib/test/regrtest.py
@@ -632,7 +632,8 @@ def main(tests=None, testdir=None, verbose=0, quiet=False,
continue
accumulate_result(test, result)
if not quiet:
- print("[{1:{0}}{2}/{3}] {4}".format(
+ fmt = "[{1:{0}}{2}/{3}] {4}" if bad else "[{1:{0}}{2}] {4}"
+ print(fmt.format(
test_count_width, test_index, test_count,
len(bad), test))
if stdout:
@@ -653,7 +654,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}] {4}".format(
+ fmt = "[{1:{0}}{2}/{3}] {4}" if bad else "[{1:{0}}{2}] {4}"
+ print(fmt.format(
test_count_width, test_index, test_count, len(bad), test))
sys.stdout.flush()
if trace: