From e7371c19d9ab89847115efbe490a23c24c23f20b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= <tor.arne.vestbo@qt.io>
Date: Tue, 21 Jul 2020 22:38:47 +0200
Subject: testlib: Defer signal dumper start until tests are ready to run

We don't want the signal dumper to pick up signals that our own
test machinery produces, such as the ones emitted from the watchdog
thread startup and shutdown. This would otherwise produce:

 tst_Signaldumper::initTestCase() Signal: QThread(7fc969e0d870) started ()

At startup, and at shutdown even more confusingly:

 tst_Signaldumper::UnknownTestFunc() Signal: QThread(7fc969e0d870) finished ()

Change-Id: I9e81fa168eaa92551d38d5576973bbf95ac23364
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
---
 tests/auto/testlib/selftests/expected_signaldumper.junitxml | 12 +++---------
 tests/auto/testlib/selftests/expected_signaldumper.lightxml |  6 ------
 tests/auto/testlib/selftests/expected_signaldumper.tap      |  2 --
 tests/auto/testlib/selftests/expected_signaldumper.teamcity |  1 -
 tests/auto/testlib/selftests/expected_signaldumper.txt      |  2 --
 tests/auto/testlib/selftests/expected_signaldumper.xml      |  6 ------
 6 files changed, 3 insertions(+), 26 deletions(-)

(limited to 'tests/auto/testlib/selftests')

diff --git a/tests/auto/testlib/selftests/expected_signaldumper.junitxml b/tests/auto/testlib/selftests/expected_signaldumper.junitxml
index 90940e061f..1077816d8d 100644
--- a/tests/auto/testlib/selftests/expected_signaldumper.junitxml
+++ b/tests/auto/testlib/selftests/expected_signaldumper.junitxml
@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite errors="126" failures="0" tests="13" name="tst_Signaldumper">
+<testsuite errors="124" failures="0" tests="13" name="tst_Signaldumper">
   <properties>
     <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/>
     <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/>
     <property value="" name="QtBuild"/>
   </properties>
-  <testcase result="pass" name="initTestCase">
-    <!-- message="Signal: QThread(_POINTER_) started ()" type="info" -->
-  </testcase>
+  <testcase result="pass" name="initTestCase"/>
   <testcase result="pass" name="noConnections">
     <!-- message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" type="info" -->
     <!-- message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" type="info" -->
@@ -154,11 +152,8 @@
   <testcase result="pass" name="deletingSender">
     <!-- message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" type="info" -->
   </testcase>
-  <testcase result="pass" name="cleanupTestCase">
-    <!-- message="    Signal: QThread(_POINTER_) finished ()" type="info" -->
-  </testcase>
+  <testcase result="pass" name="cleanupTestCase"/>
   <system-err>
-<![CDATA[Signal: QThread(_POINTER_) started ()]]>
 <![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()]]>
 <![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))]]>
 <![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()]]>
@@ -283,6 +278,5 @@
 <![CDATA[Signal: SignalSlotClass(_POINTER_) qVariantSignal (QVariant())]]>
 <![CDATA[Signal: SignalSlotClass(_POINTER_) qVariantSignal (QVariant())]]>
 <![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()]]>
-<![CDATA[    Signal: QThread(_POINTER_) finished ()]]>
   </system-err>
 </testsuite>
diff --git a/tests/auto/testlib/selftests/expected_signaldumper.lightxml b/tests/auto/testlib/selftests/expected_signaldumper.lightxml
index 2d5e6e695a..b43475089e 100644
--- a/tests/auto/testlib/selftests/expected_signaldumper.lightxml
+++ b/tests/auto/testlib/selftests/expected_signaldumper.lightxml
@@ -4,9 +4,6 @@
     <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
 </Environment>
 <TestFunction name="initTestCase">
-<Message type="info" file="" line="0">
-    <Description><![CDATA[Signal: QThread(_POINTER_) started ()]]></Description>
-</Message>
 <Incident type="pass" file="" line="0" />
     <Duration msecs="0"/>
 </TestFunction>
@@ -579,7 +576,4 @@
 <Incident type="pass" file="" line="0" />
     <Duration msecs="0"/>
 </TestFunction>
-<Message type="info" file="" line="0">
-    <Description><![CDATA[    Signal: QThread(_POINTER_) finished ()]]></Description>
-</Message>
 <Duration msecs="0"/>
diff --git a/tests/auto/testlib/selftests/expected_signaldumper.tap b/tests/auto/testlib/selftests/expected_signaldumper.tap
index 8e7b2c5744..4e0ae0bf4f 100644
--- a/tests/auto/testlib/selftests/expected_signaldumper.tap
+++ b/tests/auto/testlib/selftests/expected_signaldumper.tap
@@ -1,6 +1,5 @@
 TAP version 13
 # tst_Signaldumper
-# Signal: QThread(_POINTER_) started ()
 ok 1 - initTestCase()
 # Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()
 # Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))
@@ -146,7 +145,6 @@ ok 19 - variousTypes()
 # Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()
 ok 20 - deletingSender()
 ok 21 - cleanupTestCase()
-#     Signal: QThread(_POINTER_) finished ()
 1..21
 # tests 21
 # pass 21
diff --git a/tests/auto/testlib/selftests/expected_signaldumper.teamcity b/tests/auto/testlib/selftests/expected_signaldumper.teamcity
index f450cdc047..fcf52d48c0 100644
--- a/tests/auto/testlib/selftests/expected_signaldumper.teamcity
+++ b/tests/auto/testlib/selftests/expected_signaldumper.teamcity
@@ -1,6 +1,5 @@
 ##teamcity[testSuiteStarted name='tst_Signaldumper' flowId='tst_Signaldumper']
 ##teamcity[testStarted name='initTestCase()' flowId='tst_Signaldumper']
-##teamcity[testStdOut name='initTestCase()' out='INFO: Signal: QThread(_POINTER_) started ()' flowId='tst_Signaldumper']
 ##teamcity[testFinished name='initTestCase()' flowId='tst_Signaldumper']
 ##teamcity[testStarted name='noConnections()' flowId='tst_Signaldumper']
 ##teamcity[testStdOut name='noConnections()' out='INFO: Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()|nINFO: Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))' flowId='tst_Signaldumper']
diff --git a/tests/auto/testlib/selftests/expected_signaldumper.txt b/tests/auto/testlib/selftests/expected_signaldumper.txt
index ac4a2aed44..89eae69719 100644
--- a/tests/auto/testlib/selftests/expected_signaldumper.txt
+++ b/tests/auto/testlib/selftests/expected_signaldumper.txt
@@ -1,6 +1,5 @@
 ********* Start testing of tst_Signaldumper *********
 Config: Using QtTest library
-INFO   : tst_Signaldumper::initTestCase() Signal: QThread(_POINTER_) started ()
 PASS   : tst_Signaldumper::initTestCase()
 INFO   : tst_Signaldumper::noConnections() Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()
 INFO   : tst_Signaldumper::noConnections() Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))
@@ -146,6 +145,5 @@ PASS   : tst_Signaldumper::variousTypes()
 INFO   : tst_Signaldumper::deletingSender() Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()
 PASS   : tst_Signaldumper::deletingSender()
 PASS   : tst_Signaldumper::cleanupTestCase()
-INFO   : tst_Signaldumper::UnknownTestFunc()     Signal: QThread(_POINTER_) finished ()
 Totals: 21 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms
 ********* Finished testing of tst_Signaldumper *********
diff --git a/tests/auto/testlib/selftests/expected_signaldumper.xml b/tests/auto/testlib/selftests/expected_signaldumper.xml
index 37e7b3de92..2c251ec111 100644
--- a/tests/auto/testlib/selftests/expected_signaldumper.xml
+++ b/tests/auto/testlib/selftests/expected_signaldumper.xml
@@ -6,9 +6,6 @@
     <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
 </Environment>
 <TestFunction name="initTestCase">
-<Message type="info" file="" line="0">
-    <Description><![CDATA[Signal: QThread(_POINTER_) started ()]]></Description>
-</Message>
 <Incident type="pass" file="" line="0" />
     <Duration msecs="0"/>
 </TestFunction>
@@ -581,8 +578,5 @@
 <Incident type="pass" file="" line="0" />
     <Duration msecs="0"/>
 </TestFunction>
-<Message type="info" file="" line="0">
-    <Description><![CDATA[    Signal: QThread(_POINTER_) finished ()]]></Description>
-</Message>
 <Duration msecs="0"/>
 </TestCase>
-- 
cgit v1.2.3