From 553dec217a8f1d54c59add96cb89b565e23f11f5 Mon Sep 17 00:00:00 2001 From: Rod Vagg Date: Wed, 8 Jun 2016 16:32:10 +1000 Subject: [PATCH 1/2] Revert "test: change duration_ms to duration" This reverts commit d413378e513c47a952f7979c74f4a4d9f144ca7d. --- tools/test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/test.py b/tools/test.py index 7553da9a3c58c5..ab3da337bc6a24 100755 --- a/tools/test.py +++ b/tools/test.py @@ -310,7 +310,7 @@ def HasRun(self, output): (duration.seconds + duration.days * 24 * 3600) * 10**6) / 10**6 logger.info(' ---') - logger.info(' duration: %d.%ds' % (total_seconds, duration.microseconds / 1000)) + logger.info(' duration_ms: %d.%d' % (total_seconds, duration.microseconds / 1000)) logger.info(' ...') def Done(self): From 92662e345e9c9cb1597f862ff41bf040bd74be98 Mon Sep 17 00:00:00 2001 From: Rod Vagg Date: Wed, 8 Jun 2016 16:57:26 +1000 Subject: [PATCH 2/2] test: add note about duration_ms in TAP reporter --- tools/test.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/test.py b/tools/test.py index ab3da337bc6a24..3efafd95481023 100755 --- a/tools/test.py +++ b/tools/test.py @@ -309,6 +309,8 @@ def HasRun(self, output): 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(' ...')