summaryrefslogtreecommitdiffstats
path: root/tests/auto/testlib/selftests/expected_skipcleanup.tap
diff options
context:
space:
mode:
authorEdward Welbourne <edward.welbourne@qt.io>2022-07-11 14:27:28 +0200
committerEdward Welbourne <edward.welbourne@qt.io>2022-07-25 19:29:07 +0200
commit21e9c223b753ade33c994c1efabbd67978eda3bf (patch)
treedeb3f79829a12f43b4f52111fd37139aa5f0479d /tests/auto/testlib/selftests/expected_skipcleanup.tap
parentafbae9c2acf8d5c0846a87f03edfb9407672e9ee (diff)
Test skip and fail in cleanup() as well as in cleanupTestCase()
The skipcleanup and failcleanup tests were actually testing skip and fail in cleanupTestCase(), not in cleanup(). Add almost-duplicate tests and clean up so that we now have {fail,skip}cleanup(,testcase} tests to cover all four cases. Generated expected output. The new tests (with old names) get their fail or skip - during cleanup() - reported against the test instead of the cleanupTestCase function. (Results for {init,cleanup}TestCase() are always reported, even when these slots are not defined, as no-op passes.) Pick-to: 6.4 Change-Id: I0988d1696b50c0e2f30c45ddc25e1bd0bfd2151a Reviewed-by: Ivan Solovev <ivan.solovev@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'tests/auto/testlib/selftests/expected_skipcleanup.tap')
-rw-r--r--tests/auto/testlib/selftests/expected_skipcleanup.tap4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/testlib/selftests/expected_skipcleanup.tap b/tests/auto/testlib/selftests/expected_skipcleanup.tap
index 4a3f8f852c..36d979a84a 100644
--- a/tests/auto/testlib/selftests/expected_skipcleanup.tap
+++ b/tests/auto/testlib/selftests/expected_skipcleanup.tap
@@ -1,8 +1,8 @@
TAP version 13
# tst_SkipCleanup
ok 1 - initTestCase()
-ok 2 - aTestFunction()
-ok 3 - cleanupTestCase() # SKIP Skip inside cleanupTestCase.
+ok 2 - aTestFunction() # SKIP Skip inside cleanup.
+ok 3 - cleanupTestCase()
1..3
# tests 3
# pass 2