diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2021-08-16 16:58:32 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2021-08-27 20:16:18 +0200 |
| commit | 7af79ba09148dbfe5c1fc8b130d564dcca7ae4b3 (patch) | |
| tree | 276fe00d324daf07a53e000f6909cb65461ffeb3 /tests/auto/testlib | |
| parent | a56b915f71eb5ceb10b6c2c585eefb88657f4abf (diff) | |
Make clear why QTestLog::addB?XFail() don't add to counters
This reverts commit 904617dfb83f39a6a379635b64fea6fcd00f241a and makes
clear to future readers why that wouldn't be a sensible change.
Update the test's data, eliminating a case of duplicate counting that
was caused by the reverted commit.
Task-number: QTBUG-95661
Pick-to: 5.12 5.15 6.1 6.2
Change-Id: Ice6d3ab06ca171e0d6eb0fac757f1ab774e229f0
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'tests/auto/testlib')
| -rw-r--r-- | tests/auto/testlib/selftests/expected_blacklisted.tap | 10 | ||||
| -rw-r--r-- | tests/auto/testlib/selftests/expected_blacklisted.txt | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/tests/auto/testlib/selftests/expected_blacklisted.tap b/tests/auto/testlib/selftests/expected_blacklisted.tap index fee7750a12..f75fabbdd2 100644 --- a/tests/auto/testlib/selftests/expected_blacklisted.tap +++ b/tests/auto/testlib/selftests/expected_blacklisted.tap @@ -15,16 +15,16 @@ not ok 4 - fail() # TODO 'false' returned FALSE. (This test should BFAIL) file: qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp line: 0 ... -not ok 6 - xfail() # TODO This test should BXFAIL then BPASS +not ok 5 - xfail() # TODO This test should BXFAIL then BPASS --- # This test should BXFAIL then BPASS at: tst_Blacklisted::xfail() (qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp:0) file: qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp line: 0 ... -ok 7 - xpass() # TODO 'true' returned TRUE unexpectedly. (This test should BXPASS) -ok 8 - cleanupTestCase() -1..8 -# tests 8 +ok 6 - xpass() # TODO 'true' returned TRUE unexpectedly. (This test should BXPASS) +ok 7 - cleanupTestCase() +1..7 +# tests 7 # pass 2 # fail 0 diff --git a/tests/auto/testlib/selftests/expected_blacklisted.txt b/tests/auto/testlib/selftests/expected_blacklisted.txt index 62a2d11ed2..b633578029 100644 --- a/tests/auto/testlib/selftests/expected_blacklisted.txt +++ b/tests/auto/testlib/selftests/expected_blacklisted.txt @@ -12,5 +12,5 @@ BPASS : tst_Blacklisted::xfail() BXPASS : tst_Blacklisted::xpass() 'true' returned TRUE unexpectedly. (This test should BXPASS) Loc: [qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp(0)] PASS : tst_Blacklisted::cleanupTestCase() -Totals: 2 passed, 0 failed, 1 skipped, 5 blacklisted, 0ms +Totals: 2 passed, 0 failed, 1 skipped, 4 blacklisted, 0ms ********* Finished testing of tst_Blacklisted ********* |