Skip to content

Commit

Permalink
tools: fix duration_ms to be milliseconds
Browse files Browse the repository at this point in the history
PR-URL: #44490
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
Reviewed-By: Zeyu "Alex" Yang <himself65@outlook.com>
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
Reviewed-By: Juan José Arboleda <soyjuanarbol@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Christian Clauss <cclauss@me.com>
  • Loading branch information
MoLow authored and RafaelGSS committed Apr 8, 2023
1 parent 2a6c23e commit 03b6650
Showing 1 changed file with 2 additions and 10 deletions.
12 changes: 2 additions & 10 deletions tools/test.py
Expand Up @@ -69,7 +69,7 @@ def get_module(name, path):

from io import open
from os.path import join, dirname, abspath, basename, isdir, exists
from datetime import datetime
from datetime import datetime, timedelta
try:
from queue import Queue, Empty # Python 3
except ImportError:
Expand Down Expand Up @@ -400,16 +400,8 @@ def HasRun(self, output):


duration = output.test.duration

# total_seconds() was added in 2.7
total_seconds = (duration.microseconds +
(duration.seconds + duration.days * 24 * 3600) * 10**6) / 10**6

# duration_ms is measured in seconds and is read as such by TAP parsers.
# It should read as "duration including ms" rather than "duration in ms"
logger.info(' ---')
logger.info(' duration_ms: %d.%d' %
(total_seconds, duration.microseconds / 1000))
logger.info(' duration_ms: %.5f' % (duration / timedelta(milliseconds=1)))
if self.severity != 'ok' or self.traceback != '':
if output.HasTimedOut():
self.traceback = 'timeout\n' + output.output.stdout + output.output.stderr
Expand Down

0 comments on commit 03b6650

Please sign in to comment.