regrtest: add time to output
Timestamps should help to debug slow buildbots, and timeout and hang on
buildbots.
diff --git a/Lib/test/libregrtest/main.py b/Lib/test/libregrtest/main.py
index 82788ad..1c99f2b 100644
--- a/Lib/test/libregrtest/main.py
+++ b/Lib/test/libregrtest/main.py
@@ -1,3 +1,4 @@
+import datetime
import faulthandler
import os
import platform
@@ -7,6 +8,7 @@
import sysconfig
import tempfile
import textwrap
+import time
from test.libregrtest.cmdline import _parse_args
from test.libregrtest.runtest import (
findtests, runtest,
@@ -79,6 +81,7 @@
self.found_garbage = []
# used to display the progress bar "[ 3/100]"
+ self.start_time = time.monotonic()
self.test_count = ''
self.test_count_width = 1
@@ -102,16 +105,24 @@
self.skipped.append(test)
self.resource_denieds.append(test)
+ def time_delta(self):
+ seconds = time.monotonic() - self.start_time
+ return datetime.timedelta(seconds=int(seconds))
+
def display_progress(self, test_index, test):
if self.ns.quiet:
return
if self.bad and not self.ns.pgo:
- fmt = "[{1:{0}}{2}/{3}] {4}"
+ fmt = "{time} [{test_index:{count_width}}{test_count}/{nbad}] {test_name}"
else:
- fmt = "[{1:{0}}{2}] {4}"
- print(fmt.format(self.test_count_width, test_index,
- self.test_count, len(self.bad), test),
- flush=True)
+ fmt = "{time} [{test_index:{count_width}}{test_count}] {test_name}"
+ line = fmt.format(count_width=self.test_count_width,
+ test_index=test_index,
+ test_count=self.test_count,
+ nbad=len(self.bad),
+ test_name=test,
+ time=self.time_delta())
+ print(line, flush=True)
def parse_args(self, kwargs):
ns = _parse_args(sys.argv[1:], **kwargs)
@@ -368,6 +379,8 @@
r.write_results(show_missing=True, summary=True,
coverdir=self.ns.coverdir)
+ print("Total duration: %s" % self.time_delta())
+
if self.ns.runleaks:
os.system("leaks %d" % os.getpid())
diff --git a/Lib/test/test_regrtest.py b/Lib/test/test_regrtest.py
index 59f8c9d..18d0f46 100644
--- a/Lib/test/test_regrtest.py
+++ b/Lib/test/test_regrtest.py
@@ -351,7 +351,7 @@
self.assertRegex(output, regex)
def parse_executed_tests(self, output):
- regex = r'^\[ *[0-9]+(?:/ *[0-9]+)?\] (%s)$' % self.TESTNAME_REGEX
+ regex = r'^[0-9]+:[0-9]+:[0-9]+ \[ *[0-9]+(?:/ *[0-9]+)?\] (%s)$' % self.TESTNAME_REGEX
parser = re.finditer(regex, output, re.MULTILINE)
return list(match.group(1) for match in parser)