Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

tools: fix duration_ms to be milliseconds #44490

Merged
merged 1 commit into from Mar 31, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
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)))
MoLow marked this conversation as resolved.
Show resolved Hide resolved
if self.severity != 'ok' or self.traceback != '':
if output.HasTimedOut():
self.traceback = 'timeout\n' + output.output.stdout + output.output.stderr
Expand Down