From 77a93e6df331e5ed22aef4335d8de38abe2ca586 Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Thu, 23 Sep 2021 15:59:32 +0200 Subject: Make Skip an incident in test logging MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Skip ends the test (albeit inconclusively). Rearrange the enums in the abstract logger, move code to handle skip between relevant function and tidy up various things that became simpler as a result. Also reorder the message enum, and its switches, to separate testlib's internals from the usual Qt messages, and put each group in ascending order of severity. Task-number: QTBUG-96844 Change-Id: I2c7a634b9f849830d64eafa750155e66e244b729 Reviewed-by: Tor Arne Vestbø Reviewed-by: Thiago Macieira --- .../auto/testlib/selftests/expected_counting.teamcity | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) (limited to 'tests/auto/testlib/selftests/expected_counting.teamcity') diff --git a/tests/auto/testlib/selftests/expected_counting.teamcity b/tests/auto/testlib/selftests/expected_counting.teamcity index 5ceaf155d8..b43ab3dc8b 100644 --- a/tests/auto/testlib/selftests/expected_counting.teamcity +++ b/tests/auto/testlib/selftests/expected_counting.teamcity @@ -7,18 +7,28 @@ ##teamcity[testFinished name='testPassPass(row 2)' flowId='tst_Counting'] ##teamcity[testStarted name='testPassSkip(row 1)' flowId='tst_Counting'] ##teamcity[testFinished name='testPassSkip(row 1)' flowId='tst_Counting'] +##teamcity[testStarted name='testPassSkip(row 2)' flowId='tst_Counting'] ##teamcity[testIgnored name='testPassSkip(row 2)' message='Skipping |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' flowId='tst_Counting'] +##teamcity[testFinished name='testPassSkip(row 2)' flowId='tst_Counting'] ##teamcity[testStarted name='testPassFail(row 1)' flowId='tst_Counting'] ##teamcity[testFinished name='testPassFail(row 1)' flowId='tst_Counting'] ##teamcity[testStarted name='testPassFail(row 2)' flowId='tst_Counting'] ##teamcity[testFailed name='testPassFail(row 2)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' details='|'false|' returned FALSE. ()' flowId='tst_Counting'] ##teamcity[testFinished name='testPassFail(row 2)' flowId='tst_Counting'] +##teamcity[testStarted name='testSkipPass(row 1)' flowId='tst_Counting'] ##teamcity[testIgnored name='testSkipPass(row 1)' message='Skipping |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' flowId='tst_Counting'] +##teamcity[testFinished name='testSkipPass(row 1)' flowId='tst_Counting'] ##teamcity[testStarted name='testSkipPass(row 2)' flowId='tst_Counting'] ##teamcity[testFinished name='testSkipPass(row 2)' flowId='tst_Counting'] +##teamcity[testStarted name='testSkipSkip(row 1)' flowId='tst_Counting'] ##teamcity[testIgnored name='testSkipSkip(row 1)' message='Skipping |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' flowId='tst_Counting'] +##teamcity[testFinished name='testSkipSkip(row 1)' flowId='tst_Counting'] +##teamcity[testStarted name='testSkipSkip(row 2)' flowId='tst_Counting'] ##teamcity[testIgnored name='testSkipSkip(row 2)' message='Skipping |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' flowId='tst_Counting'] +##teamcity[testFinished name='testSkipSkip(row 2)' flowId='tst_Counting'] +##teamcity[testStarted name='testSkipFail(row 1)' flowId='tst_Counting'] ##teamcity[testIgnored name='testSkipFail(row 1)' message='Skipping |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' flowId='tst_Counting'] +##teamcity[testFinished name='testSkipFail(row 1)' flowId='tst_Counting'] ##teamcity[testStarted name='testSkipFail(row 2)' flowId='tst_Counting'] ##teamcity[testFailed name='testSkipFail(row 2)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' details='|'false|' returned FALSE. ()' flowId='tst_Counting'] ##teamcity[testFinished name='testSkipFail(row 2)' flowId='tst_Counting'] @@ -30,7 +40,9 @@ ##teamcity[testStarted name='testFailSkip(row 1)' flowId='tst_Counting'] ##teamcity[testFailed name='testFailSkip(row 1)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' details='|'false|' returned FALSE. ()' flowId='tst_Counting'] ##teamcity[testFinished name='testFailSkip(row 1)' flowId='tst_Counting'] +##teamcity[testStarted name='testFailSkip(row 2)' flowId='tst_Counting'] ##teamcity[testIgnored name='testFailSkip(row 2)' message='Skipping |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' flowId='tst_Counting'] +##teamcity[testFinished name='testFailSkip(row 2)' flowId='tst_Counting'] ##teamcity[testStarted name='testFailFail(row 1)' flowId='tst_Counting'] ##teamcity[testFailed name='testFailFail(row 1)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' details='|'false|' returned FALSE. ()' flowId='tst_Counting'] ##teamcity[testFinished name='testFailFail(row 1)' flowId='tst_Counting'] @@ -54,14 +66,18 @@ ##teamcity[testFinished name='testFailInCleanup(after)' flowId='tst_Counting'] ##teamcity[testStarted name='testSkipInInit(before)' flowId='tst_Counting'] ##teamcity[testFinished name='testSkipInInit(before)' flowId='tst_Counting'] +##teamcity[testStarted name='testSkipInInit(skip)' flowId='tst_Counting'] ##teamcity[testIgnored name='testSkipInInit(skip)' message='Skip in init() |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' flowId='tst_Counting'] +##teamcity[testFinished name='testSkipInInit(skip)' flowId='tst_Counting'] ##teamcity[testStarted name='testSkipInInit(after)' flowId='tst_Counting'] ##teamcity[testFinished name='testSkipInInit(after)' flowId='tst_Counting'] ##teamcity[testStarted name='testSkipInCleanup(before)' flowId='tst_Counting'] ##teamcity[testFinished name='testSkipInCleanup(before)' flowId='tst_Counting'] +##teamcity[testStarted name='testSkipInCleanup(skip)' flowId='tst_Counting'] ##teamcity[testIgnored name='testSkipInCleanup(skip)' message='Skip in cleanup() |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' flowId='tst_Counting'] +##teamcity[testStdOut name='testSkipInCleanup(skip)' out='QDEBUG: This test function should execute and then QSKIP in cleanup()' flowId='tst_Counting'] +##teamcity[testFinished name='testSkipInCleanup(skip)' flowId='tst_Counting'] ##teamcity[testStarted name='testSkipInCleanup(after)' flowId='tst_Counting'] -##teamcity[testStdOut name='testSkipInCleanup(after)' out='QDEBUG: This test function should execute and then QSKIP in cleanup()' flowId='tst_Counting'] ##teamcity[testFinished name='testSkipInCleanup(after)' flowId='tst_Counting'] ##teamcity[testStarted name='cleanupTestCase()' flowId='tst_Counting'] ##teamcity[testFinished name='cleanupTestCase()' flowId='tst_Counting'] -- cgit v1.2.3