From 8f036562119dd35ce51dc9230304d893b906bd37 Mon Sep 17 00:00:00 2001 From: Borgar Ovsthus Date: Wed, 2 Aug 2017 18:48:14 +0200 Subject: Add flowId to messages when logging in TeamCity format Added flowId='name' to each message when using TeamCity logging format. This is necessary to distinguish separate processes running in parallel. [ChangeLog][QtTest] Added flowId to messages when logging in TeamCity format. FlowId is used to distinguish logging from multiple processes running in parallel. Change-Id: I7f5046c1058ff02770404caa2c9b3a5398f97f6b Reviewed-by: Thiago Macieira --- .../testlib/selftests/expected_verbose1.teamcity | 136 ++++++++++----------- 1 file changed, 68 insertions(+), 68 deletions(-) (limited to 'tests/auto/testlib/selftests/expected_verbose1.teamcity') diff --git a/tests/auto/testlib/selftests/expected_verbose1.teamcity b/tests/auto/testlib/selftests/expected_verbose1.teamcity index 3d7bd75393..e6d324a573 100644 --- a/tests/auto/testlib/selftests/expected_verbose1.teamcity +++ b/tests/auto/testlib/selftests/expected_verbose1.teamcity @@ -1,68 +1,68 @@ -##teamcity[testSuiteStarted name='tst_Counting'] -##teamcity[testStarted name='initTestCase()'] -##teamcity[testFinished name='initTestCase()'] -##teamcity[testStarted name='testPassPass(row 1)'] -##teamcity[testFinished name='testPassPass(row 1)'] -##teamcity[testStarted name='testPassPass(row 2)'] -##teamcity[testFinished name='testPassPass(row 2)'] -##teamcity[testStarted name='testPassSkip(row 1)'] -##teamcity[testFinished name='testPassSkip(row 1)'] -##teamcity[testIgnored name='testPassSkip(row 2)' message='Skipping |[Loc: ../counting/tst_counting.cpp(110)|]'] -##teamcity[testStarted name='testPassFail(row 1)'] -##teamcity[testFinished name='testPassFail(row 1)'] -##teamcity[testStarted name='testPassFail(row 2)'] -##teamcity[testFailed name='testPassFail(row 2)' message='Failure! |[Loc: ../counting/tst_counting.cpp(107)|]' details='|'false|' returned FALSE. ()'] -##teamcity[testFinished name='testPassFail(row 2)'] -##teamcity[testIgnored name='testSkipPass(row 1)' message='Skipping |[Loc: ../counting/tst_counting.cpp(110)|]'] -##teamcity[testStarted name='testSkipPass(row 2)'] -##teamcity[testFinished name='testSkipPass(row 2)'] -##teamcity[testIgnored name='testSkipSkip(row 1)' message='Skipping |[Loc: ../counting/tst_counting.cpp(110)|]'] -##teamcity[testIgnored name='testSkipSkip(row 2)' message='Skipping |[Loc: ../counting/tst_counting.cpp(110)|]'] -##teamcity[testIgnored name='testSkipFail(row 1)' message='Skipping |[Loc: ../counting/tst_counting.cpp(110)|]'] -##teamcity[testStarted name='testSkipFail(row 2)'] -##teamcity[testFailed name='testSkipFail(row 2)' message='Failure! |[Loc: ../counting/tst_counting.cpp(107)|]' details='|'false|' returned FALSE. ()'] -##teamcity[testFinished name='testSkipFail(row 2)'] -##teamcity[testStarted name='testFailPass(row 1)'] -##teamcity[testFailed name='testFailPass(row 1)' message='Failure! |[Loc: ../counting/tst_counting.cpp(107)|]' details='|'false|' returned FALSE. ()'] -##teamcity[testFinished name='testFailPass(row 1)'] -##teamcity[testStarted name='testFailPass(row 2)'] -##teamcity[testFinished name='testFailPass(row 2)'] -##teamcity[testStarted name='testFailSkip(row 1)'] -##teamcity[testFailed name='testFailSkip(row 1)' message='Failure! |[Loc: ../counting/tst_counting.cpp(107)|]' details='|'false|' returned FALSE. ()'] -##teamcity[testFinished name='testFailSkip(row 1)'] -##teamcity[testIgnored name='testFailSkip(row 2)' message='Skipping |[Loc: ../counting/tst_counting.cpp(110)|]'] -##teamcity[testStarted name='testFailFail(row 1)'] -##teamcity[testFailed name='testFailFail(row 1)' message='Failure! |[Loc: ../counting/tst_counting.cpp(107)|]' details='|'false|' returned FALSE. ()'] -##teamcity[testFinished name='testFailFail(row 1)'] -##teamcity[testStarted name='testFailFail(row 2)'] -##teamcity[testFailed name='testFailFail(row 2)' message='Failure! |[Loc: ../counting/tst_counting.cpp(107)|]' details='|'false|' returned FALSE. ()'] -##teamcity[testFinished name='testFailFail(row 2)'] -##teamcity[testStarted name='testFailInInit(before)'] -##teamcity[testFinished name='testFailInInit(before)'] -##teamcity[testStarted name='testFailInInit(fail)'] -##teamcity[testFailed name='testFailInInit(fail)' message='Failure! |[Loc: ../counting/tst_counting.cpp(226)|]' details='Fail in init()'] -##teamcity[testFinished name='testFailInInit(fail)'] -##teamcity[testStarted name='testFailInInit(after)'] -##teamcity[testFinished name='testFailInInit(after)'] -##teamcity[testStarted name='testFailInCleanup(before)'] -##teamcity[testFinished name='testFailInCleanup(before)'] -##teamcity[testStarted name='testFailInCleanup(fail)'] -##teamcity[testFailed name='testFailInCleanup(fail)' message='Failure! |[Loc: ../counting/tst_counting.cpp(234)|]' details='Fail in cleanup()'] -##teamcity[testStdOut name='testFailInCleanup(fail)' out='QDEBUG: This test function should execute and then QFAIL in cleanup()'] -##teamcity[testFinished name='testFailInCleanup(fail)'] -##teamcity[testStarted name='testFailInCleanup(after)'] -##teamcity[testFinished name='testFailInCleanup(after)'] -##teamcity[testStarted name='testSkipInInit(before)'] -##teamcity[testFinished name='testSkipInInit(before)'] -##teamcity[testIgnored name='testSkipInInit(skip)' message='Skip in init() |[Loc: ../counting/tst_counting.cpp(228)|]'] -##teamcity[testStarted name='testSkipInInit(after)'] -##teamcity[testFinished name='testSkipInInit(after)'] -##teamcity[testStarted name='testSkipInCleanup(before)'] -##teamcity[testFinished name='testSkipInCleanup(before)'] -##teamcity[testIgnored name='testSkipInCleanup(skip)' message='Skip in cleanup() |[Loc: ../counting/tst_counting.cpp(236)|]'] -##teamcity[testStarted name='testSkipInCleanup(after)'] -##teamcity[testStdOut name='testSkipInCleanup(after)' out='QDEBUG: This test function should execute and then QSKIP in cleanup()'] -##teamcity[testFinished name='testSkipInCleanup(after)'] -##teamcity[testStarted name='cleanupTestCase()'] -##teamcity[testFinished name='cleanupTestCase()'] -##teamcity[testSuiteFinished name='tst_Counting'] +##teamcity[testSuiteStarted name='tst_Counting' flowId='tst_Counting'] +##teamcity[testStarted name='initTestCase()' flowId='tst_Counting'] +##teamcity[testFinished name='initTestCase()' flowId='tst_Counting'] +##teamcity[testStarted name='testPassPass(row 1)' flowId='tst_Counting'] +##teamcity[testFinished name='testPassPass(row 1)' flowId='tst_Counting'] +##teamcity[testStarted name='testPassPass(row 2)' flowId='tst_Counting'] +##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[testIgnored name='testPassSkip(row 2)' message='Skipping |[Loc: ../counting/tst_counting.cpp(110)|]' 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: ../counting/tst_counting.cpp(107)|]' details='|'false|' returned FALSE. ()' flowId='tst_Counting'] +##teamcity[testFinished name='testPassFail(row 2)' flowId='tst_Counting'] +##teamcity[testIgnored name='testSkipPass(row 1)' message='Skipping |[Loc: ../counting/tst_counting.cpp(110)|]' flowId='tst_Counting'] +##teamcity[testStarted name='testSkipPass(row 2)' flowId='tst_Counting'] +##teamcity[testFinished name='testSkipPass(row 2)' flowId='tst_Counting'] +##teamcity[testIgnored name='testSkipSkip(row 1)' message='Skipping |[Loc: ../counting/tst_counting.cpp(110)|]' flowId='tst_Counting'] +##teamcity[testIgnored name='testSkipSkip(row 2)' message='Skipping |[Loc: ../counting/tst_counting.cpp(110)|]' flowId='tst_Counting'] +##teamcity[testIgnored name='testSkipFail(row 1)' message='Skipping |[Loc: ../counting/tst_counting.cpp(110)|]' flowId='tst_Counting'] +##teamcity[testStarted name='testSkipFail(row 2)' flowId='tst_Counting'] +##teamcity[testFailed name='testSkipFail(row 2)' message='Failure! |[Loc: ../counting/tst_counting.cpp(107)|]' details='|'false|' returned FALSE. ()' flowId='tst_Counting'] +##teamcity[testFinished name='testSkipFail(row 2)' flowId='tst_Counting'] +##teamcity[testStarted name='testFailPass(row 1)' flowId='tst_Counting'] +##teamcity[testFailed name='testFailPass(row 1)' message='Failure! |[Loc: ../counting/tst_counting.cpp(107)|]' details='|'false|' returned FALSE. ()' flowId='tst_Counting'] +##teamcity[testFinished name='testFailPass(row 1)' flowId='tst_Counting'] +##teamcity[testStarted name='testFailPass(row 2)' flowId='tst_Counting'] +##teamcity[testFinished name='testFailPass(row 2)' flowId='tst_Counting'] +##teamcity[testStarted name='testFailSkip(row 1)' flowId='tst_Counting'] +##teamcity[testFailed name='testFailSkip(row 1)' message='Failure! |[Loc: ../counting/tst_counting.cpp(107)|]' details='|'false|' returned FALSE. ()' flowId='tst_Counting'] +##teamcity[testFinished name='testFailSkip(row 1)' flowId='tst_Counting'] +##teamcity[testIgnored name='testFailSkip(row 2)' message='Skipping |[Loc: ../counting/tst_counting.cpp(110)|]' flowId='tst_Counting'] +##teamcity[testStarted name='testFailFail(row 1)' flowId='tst_Counting'] +##teamcity[testFailed name='testFailFail(row 1)' message='Failure! |[Loc: ../counting/tst_counting.cpp(107)|]' details='|'false|' returned FALSE. ()' flowId='tst_Counting'] +##teamcity[testFinished name='testFailFail(row 1)' flowId='tst_Counting'] +##teamcity[testStarted name='testFailFail(row 2)' flowId='tst_Counting'] +##teamcity[testFailed name='testFailFail(row 2)' message='Failure! |[Loc: ../counting/tst_counting.cpp(107)|]' details='|'false|' returned FALSE. ()' flowId='tst_Counting'] +##teamcity[testFinished name='testFailFail(row 2)' flowId='tst_Counting'] +##teamcity[testStarted name='testFailInInit(before)' flowId='tst_Counting'] +##teamcity[testFinished name='testFailInInit(before)' flowId='tst_Counting'] +##teamcity[testStarted name='testFailInInit(fail)' flowId='tst_Counting'] +##teamcity[testFailed name='testFailInInit(fail)' message='Failure! |[Loc: ../counting/tst_counting.cpp(226)|]' details='Fail in init()' flowId='tst_Counting'] +##teamcity[testFinished name='testFailInInit(fail)' flowId='tst_Counting'] +##teamcity[testStarted name='testFailInInit(after)' flowId='tst_Counting'] +##teamcity[testFinished name='testFailInInit(after)' flowId='tst_Counting'] +##teamcity[testStarted name='testFailInCleanup(before)' flowId='tst_Counting'] +##teamcity[testFinished name='testFailInCleanup(before)' flowId='tst_Counting'] +##teamcity[testStarted name='testFailInCleanup(fail)' flowId='tst_Counting'] +##teamcity[testFailed name='testFailInCleanup(fail)' message='Failure! |[Loc: ../counting/tst_counting.cpp(234)|]' details='Fail in cleanup()' flowId='tst_Counting'] +##teamcity[testStdOut name='testFailInCleanup(fail)' out='QDEBUG: This test function should execute and then QFAIL in cleanup()' flowId='tst_Counting'] +##teamcity[testFinished name='testFailInCleanup(fail)' flowId='tst_Counting'] +##teamcity[testStarted name='testFailInCleanup(after)' flowId='tst_Counting'] +##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[testIgnored name='testSkipInInit(skip)' message='Skip in init() |[Loc: ../counting/tst_counting.cpp(228)|]' 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[testIgnored name='testSkipInCleanup(skip)' message='Skip in cleanup() |[Loc: ../counting/tst_counting.cpp(236)|]' 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'] +##teamcity[testSuiteFinished name='tst_Counting' flowId='tst_Counting'] -- cgit v1.2.3