Commit 64af7c0d authored by Ezio Melotti's avatar Ezio Melotti

#12074: merge with 3.2.

parents 17ec7cd9 84f75c68
...@@ -632,7 +632,8 @@ def main(tests=None, testdir=None, verbose=0, quiet=False, ...@@ -632,7 +632,8 @@ def main(tests=None, testdir=None, verbose=0, quiet=False,
continue continue
accumulate_result(test, result) accumulate_result(test, result)
if not quiet: 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, test_count_width, test_index, test_count,
len(bad), test)) len(bad), test))
if stdout: if stdout:
...@@ -653,7 +654,8 @@ def main(tests=None, testdir=None, verbose=0, quiet=False, ...@@ -653,7 +654,8 @@ def main(tests=None, testdir=None, verbose=0, quiet=False,
else: else:
for test_index, test in enumerate(tests, 1): for test_index, test in enumerate(tests, 1):
if not quiet: 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)) test_count_width, test_index, test_count, len(bad), test))
sys.stdout.flush() sys.stdout.flush()
if trace: if trace:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment