From 9fa0d3786febf36c87ef059a39115aa1ce3326e8 Mon Sep 17 00:00:00 2001 From: romgar Date: Mon, 19 Nov 2018 23:15:20 +0000 Subject: Refs #25251 -- Filtered out skipped tests when processing the test suite to set _next_serialized_rollback. --- tests/test_runner/test_discover_runner.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'tests/test_runner') diff --git a/tests/test_runner/test_discover_runner.py b/tests/test_runner/test_discover_runner.py index 8887f2d22d..efc055978d 100644 --- a/tests/test_runner/test_discover_runner.py +++ b/tests/test_runner/test_discover_runner.py @@ -234,20 +234,21 @@ class DiscoverRunnerTests(SimpleTestCase): def test_transaction_test_case_next_serialized_rollback_option(self): runner = DiscoverRunner() suite = runner.build_suite(['test_discovery_sample3.tests_transaction_test_case_mixed']) - django_test_case, first_transaction_test_case, middle_transaction_test_case, \ - last_transaction_test_case, vanilla_test_case = suite + django_test_case, first_transaction_test_case, second_transaction_test_case, \ + third_transaction_test_case, fourth_transaction_test_case, vanilla_test_case = suite # TransactionTestCase1._next_serialized_rollback is # TransactionTestCase2.serialize_rollback. self.assertEqual( first_transaction_test_case._next_serialized_rollback, - middle_transaction_test_case.serialized_rollback + second_transaction_test_case.serialized_rollback ) # TransactionTestCase2._next_serialized_rollback is - # TransactionTestCase3.serialize_rollback. + # TransactionTestCase4.serialize_rollback because TransactionTestCase3 + # is skipped. self.assertEqual( - middle_transaction_test_case._next_serialized_rollback, - last_transaction_test_case.serialized_rollback + second_transaction_test_case._next_serialized_rollback, + fourth_transaction_test_case.serialized_rollback ) # The last TransactionTestCase of the suite has - # _next_serialized_rollback to = True. - self.assertIs(last_transaction_test_case._next_serialized_rollback, True) + # _next_serialized_rollback = True. + self.assertIs(fourth_transaction_test_case._next_serialized_rollback, True) -- cgit v1.3