diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2017-08-07 13:53:05 -0700 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-08-08 11:48:10 +0200 |
| commit | 883dfb3d156431eeb3ffc8f02a09c89bb7fa7d46 (patch) | |
| tree | d4c2b3d096e1d5c64be698b5d0cd8c8bae35b2b4 /tests/auto/testlib/selftests/expected_datetime.teamcity | |
| parent | 5a9b1425e187bc77122354cf7446bcf6bb322ff4 (diff) | |
| parent | b75bc0f75c09b192dba68449b009cdf175519dbd (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/widgets/kernel/qwidget.cpp
This merge also extends the expected output of the pairdiagnostics
teamcity output (added in dev in commit
c608ffc56ab37f9a9d5b9c34543126adb89e2b08) after the recent addition of
the flowId attribute to the teamcity output (commit
8f036562119dd35ce51dc9230304d893b906bd37 in 5.9).
Change-Id: I3868166e5efc45538544fffd14d8aba438f9173c
Diffstat (limited to 'tests/auto/testlib/selftests/expected_datetime.teamcity')
| -rw-r--r-- | tests/auto/testlib/selftests/expected_datetime.teamcity | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/tests/auto/testlib/selftests/expected_datetime.teamcity b/tests/auto/testlib/selftests/expected_datetime.teamcity index 4a4909b001..a2bc95cd2f 100644 --- a/tests/auto/testlib/selftests/expected_datetime.teamcity +++ b/tests/auto/testlib/selftests/expected_datetime.teamcity @@ -1,19 +1,19 @@ -##teamcity[testSuiteStarted name='tst_DateTime'] -##teamcity[testStarted name='initTestCase()'] -##teamcity[testFinished name='initTestCase()'] -##teamcity[testStarted name='dateTime()'] -##teamcity[testFailed name='dateTime()' message='Failure! |[Loc: tst_datetime.cpp(57)|]' details='Compared values are not the same|n Actual (local): 2000/05/03 04:03:04.000|[UTC+00:02|]|n Expected (utc) : 2000/05/03 04:03:04.000|[UTC|]'] -##teamcity[testFinished name='dateTime()'] -##teamcity[testStarted name='qurl(empty urls)'] -##teamcity[testFinished name='qurl(empty urls)'] -##teamcity[testStarted name='qurl(empty rhs)'] -##teamcity[testFailed name='qurl(empty rhs)' message='Failure! |[Loc: tst_datetime.cpp(65)|]' details='Compared values are not the same|n Actual (operandA): http://example.com|n Expected (operandB): Invalid URL:'] -##teamcity[testFinished name='qurl(empty rhs)'] -##teamcity[testStarted name='qurl(empty lhs)'] -##teamcity[testFailed name='qurl(empty lhs)' message='Failure! |[Loc: tst_datetime.cpp(65)|]' details='Compared values are not the same|n Actual (operandA): Invalid URL: |n Expected (operandB): http://example.com'] -##teamcity[testFinished name='qurl(empty lhs)'] -##teamcity[testStarted name='qurl(same urls)'] -##teamcity[testFinished name='qurl(same urls)'] -##teamcity[testStarted name='cleanupTestCase()'] -##teamcity[testFinished name='cleanupTestCase()'] -##teamcity[testSuiteFinished name='tst_DateTime'] +##teamcity[testSuiteStarted name='tst_DateTime' flowId='tst_DateTime'] +##teamcity[testStarted name='initTestCase()' flowId='tst_DateTime'] +##teamcity[testFinished name='initTestCase()' flowId='tst_DateTime'] +##teamcity[testStarted name='dateTime()' flowId='tst_DateTime'] +##teamcity[testFailed name='dateTime()' message='Failure! |[Loc: tst_datetime.cpp(57)|]' details='Compared values are not the same|n Actual (local): 2000/05/03 04:03:04.000|[UTC+00:02|]|n Expected (utc) : 2000/05/03 04:03:04.000|[UTC|]' flowId='tst_DateTime'] +##teamcity[testFinished name='dateTime()' flowId='tst_DateTime'] +##teamcity[testStarted name='qurl(empty urls)' flowId='tst_DateTime'] +##teamcity[testFinished name='qurl(empty urls)' flowId='tst_DateTime'] +##teamcity[testStarted name='qurl(empty rhs)' flowId='tst_DateTime'] +##teamcity[testFailed name='qurl(empty rhs)' message='Failure! |[Loc: tst_datetime.cpp(65)|]' details='Compared values are not the same|n Actual (operandA): http://example.com|n Expected (operandB): Invalid URL:' flowId='tst_DateTime'] +##teamcity[testFinished name='qurl(empty rhs)' flowId='tst_DateTime'] +##teamcity[testStarted name='qurl(empty lhs)' flowId='tst_DateTime'] +##teamcity[testFailed name='qurl(empty lhs)' message='Failure! |[Loc: tst_datetime.cpp(65)|]' details='Compared values are not the same|n Actual (operandA): Invalid URL: |n Expected (operandB): http://example.com' flowId='tst_DateTime'] +##teamcity[testFinished name='qurl(empty lhs)' flowId='tst_DateTime'] +##teamcity[testStarted name='qurl(same urls)' flowId='tst_DateTime'] +##teamcity[testFinished name='qurl(same urls)' flowId='tst_DateTime'] +##teamcity[testStarted name='cleanupTestCase()' flowId='tst_DateTime'] +##teamcity[testFinished name='cleanupTestCase()' flowId='tst_DateTime'] +##teamcity[testSuiteFinished name='tst_DateTime' flowId='tst_DateTime'] |