summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMårten Nordheim <marten.nordheim@qt.io>2022-09-07 11:07:32 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2022-09-08 21:02:03 +0000
commit5b2c32c262d7b0d44c3b7a2fed5cd8d139c08365 (patch)
treeddfc8f644a93198f51af0be5006471fcd4023478
parenttst_QSslSocket::serverCipherPreferencies - fix for OpenSSL v3 (diff)
downloadqtbase-5b2c32c262d7b0d44c3b7a2fed5cd8d139c08365.tar.xz
qtbase-5b2c32c262d7b0d44c3b7a2fed5cd8d139c08365.zip
JUnit: Don't turn seconds into kilo-seconds
Overlooked in the review where this changed, this value was already in seconds and needs to be converted to millis before converting back. Now printing output such as: <testcase name="initTestCase" classname="tst_QHash" time="0.001"/> Amends bb74e72aa92b599cb4c80c23161ce9b66639ec01 Fixes: QTBUG-106222 Change-Id: I1f8b774eea3dcbe2b4e822e2b0b2efb1ccc01abb Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> (cherry picked from commit 95e315a66e4cc6bcafc442b6e5d5377b82ba8295) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--src/testlib/qjunittestlogger.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/testlib/qjunittestlogger.cpp b/src/testlib/qjunittestlogger.cpp
index cea7fa8b14..2f1cf65b2c 100644
--- a/src/testlib/qjunittestlogger.cpp
+++ b/src/testlib/qjunittestlogger.cpp
@@ -205,7 +205,7 @@ void QJUnitTestLogger::leaveTestFunction()
void QJUnitTestLogger::leaveTestCase()
{
currentTestCase->addAttribute(QTest::AI_Time,
- toSecondsFormat(elapsedTestCaseSeconds()).constData());
+ toSecondsFormat(elapsedTestCaseSeconds() * 1000).constData());
if (!systemOutputElement->childElements().empty())
currentTestCase->addChild(systemOutputElement);