regrtest: display test duration in sequential mode
Only display duration if a test takes more than 30 seconds.
diff --git a/Lib/test/libregrtest/main.py b/Lib/test/libregrtest/main.py
index 1c99f2b..b954db5 100644
--- a/Lib/test/libregrtest/main.py
+++ b/Lib/test/libregrtest/main.py
@@ -13,7 +13,8 @@
from test.libregrtest.runtest import (
findtests, runtest,
STDTESTS, NOTTESTS, PASSED, FAILED, ENV_CHANGED, SKIPPED, RESOURCE_DENIED,
- INTERRUPTED, CHILD_ERROR)
+ INTERRUPTED, CHILD_ERROR,
+ PROGRESS_MIN_TIME)
from test.libregrtest.setup import setup_tests
from test import support
try:
@@ -293,8 +294,15 @@
save_modules = sys.modules.keys()
+ previous_test = None
for test_index, test in enumerate(self.tests, 1):
- self.display_progress(test_index, test)
+ start_time = time.monotonic()
+
+ text = test
+ if previous_test:
+ text = '%s -- %s' % (text, previous_test)
+ self.display_progress(test_index, text)
+
if self.tracer:
# If we're tracing code coverage, then we don't exit with status
# if on a false return value from main.
@@ -311,6 +319,12 @@
else:
self.accumulate_result(test, result)
+ test_time = time.monotonic() - start_time
+ if test_time >= PROGRESS_MIN_TIME:
+ previous_test = '%s took %.0f sec' % (test, test_time)
+ else:
+ previous_test = None
+
if self.ns.findleaks:
gc.collect()
if gc.garbage:
@@ -326,6 +340,9 @@
if module not in save_modules and module.startswith("test."):
support.unload(module)
+ if previous_test:
+ print(previous_test)
+
def _test_forever(self, tests):
while True:
for test in tests: