bpo-33718: regrtest: enhance "running:" formatting by vstinner · Pull Request #7292 · python/cpython

Expand Up @@ -8,7 +8,6 @@ import sys import sysconfig import tempfile import textwrap import time import unittest from test.libregrtest.cmdline import _parse_args Expand All @@ -18,6 +17,7 @@ INTERRUPTED, CHILD_ERROR, PROGRESS_MIN_TIME, format_test_result) from test.libregrtest.setup import setup_tests from test.libregrtest.utils import removepy, count, format_duration, printlist from test import support try: import gc Expand All @@ -41,16 +41,6 @@ TEMPDIR = os.path.abspath(TEMPDIR)

def format_duration(seconds): if seconds < 1.0: return '%.0f ms' % (seconds * 1e3) if seconds < 60.0: return '%.0f sec' % seconds
minutes, seconds = divmod(seconds, 60.0) return '%.0f min %.0f sec' % (minutes, seconds)

class Regrtest: """Execute a test suite.
Expand Down Expand Up @@ -567,37 +557,6 @@ def _main(self, tests, kwargs): sys.exit(0)

def removepy(names): if not names: return for idx, name in enumerate(names): basename, ext = os.path.splitext(name) if ext == '.py': names[idx] = basename

def count(n, word): if n == 1: return "%d %s" % (n, word) else: return "%d %ss" % (n, word)

def printlist(x, width=70, indent=4, file=None): """Print the elements of iterable x to stdout.
Optional arg width (default 70) is the maximum line length. Optional arg indent (default 4) is the number of blanks with which to begin each line. """
blanks = ' ' * indent # Print the sorted list: 'x' may be a '--random' list or a set() print(textwrap.fill(' '.join(str(elt) for elt in sorted(x)), width, initial_indent=blanks, subsequent_indent=blanks), file=file)

def main(tests=None, **kwargs): """Run the Python suite.""" Regrtest().main(tests=tests, **kwargs)