From 03b6650c815e99c75b1f59baa13ce250bf2f9340 Mon Sep 17 00:00:00 2001 From: Moshe Atlow Date: Fri, 31 Mar 2023 15:24:18 +0300 Subject: [PATCH] tools: fix duration_ms to be milliseconds MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit PR-URL: https://github.com/nodejs/node/pull/44490 Reviewed-By: Benjamin Gruenbaum Reviewed-By: Zeyu "Alex" Yang Reviewed-By: Antoine du Hamel Reviewed-By: Juan José Arboleda Reviewed-By: James M Snell Reviewed-By: Christian Clauss --- tools/test.py | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/tools/test.py b/tools/test.py index 44f21ec126b25d..cdec4bc8a1be69 100755 --- a/tools/test.py +++ b/tools/test.py @@ -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: @@ -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