mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-03-12 02:12:38 +00:00
Code Issues 32 Releases Wiki Activity

Refs #25251 -- Filtered out skipped tests when processing the test suite to set _next_serialized_rollback.

Browse Source
This commit is contained in:
romgar 2018-11-19 23:15:20 +00:00 committed by Tim Graham
parent 7d1123e5ad
commit 9fa0d3786f
3 changed files with 29 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
django/test/runner.py
View File

@ -646,7 +646,12 @@ def reorder_postprocess(reordered_suite):
If the next test has no serialized_rollback attribute, it means there If the next test has no serialized_rollback attribute, it means there
aren't any more TransactionTestCases. aren't any more TransactionTestCases.
""" """
for previous_test, next_test in zip(reordered_suite._tests[:-1], reordered_suite._tests[1:]): # Filter out skipped tests.
active_tests = [
test for test in reordered_suite._tests
if not getattr(test, '__unittest_skip__', False)
]
for previous_test, next_test in zip(active_tests[:-1], active_tests[1:]):
next_serialized_rollback = getattr(next_test, 'serialized_rollback', None) next_serialized_rollback = getattr(next_test, 'serialized_rollback', None)
if next_serialized_rollback is not None: if next_serialized_rollback is not None:
previous_test._next_serialized_rollback = next_serialized_rollback previous_test._next_serialized_rollback = next_serialized_rollback

15
tests/test_discovery_sample3/tests_transaction_test_case_mixed.py
View File

@ -1,6 +1,8 @@
from unittest import TestCase from unittest import TestCase
from django.test import TestCase as DjangoTestCase, TransactionTestCase from django.test import (
TestCase as DjangoTestCase, TransactionTestCase, skipUnlessDBFeature,
)
class TestVanillaUnittest(TestCase): class TestVanillaUnittest(TestCase):
@ -29,7 +31,18 @@ class TestTransactionTestCase2(TransactionTestCase):
self.assertEqual(1, 1) self.assertEqual(1, 1)
# django.test.runner.reorder_postprocess() ignores this skipped test when
# assigning _next_serialized_rollback.
@skipUnlessDBFeature('nonexistent')
class TestTransactionTestCase3(TransactionTestCase): class TestTransactionTestCase3(TransactionTestCase):
available_apps = ['test_discovery_sample3']
serialized_rollback = True
def test_sample(self):
self.assertEqual(1, 1)
class TestTransactionTestCase4(TransactionTestCase):
available_apps = ['test_discovery_sample3'] available_apps = ['test_discovery_sample3']
serialized_rollback = False serialized_rollback = False

17
tests/test_runner/test_discover_runner.py
View File

@ -234,20 +234,21 @@ class DiscoverRunnerTests(SimpleTestCase):
def test_transaction_test_case_next_serialized_rollback_option(self): def test_transaction_test_case_next_serialized_rollback_option(self):
runner = DiscoverRunner() runner = DiscoverRunner()
suite = runner.build_suite(['test_discovery_sample3.tests_transaction_test_case_mixed']) suite = runner.build_suite(['test_discovery_sample3.tests_transaction_test_case_mixed'])
django_test_case, first_transaction_test_case, middle_transaction_test_case, \ django_test_case, first_transaction_test_case, second_transaction_test_case, \
last_transaction_test_case, vanilla_test_case = suite third_transaction_test_case, fourth_transaction_test_case, vanilla_test_case = suite
# TransactionTestCase1._next_serialized_rollback is # TransactionTestCase1._next_serialized_rollback is
# TransactionTestCase2.serialize_rollback. # TransactionTestCase2.serialize_rollback.
self.assertEqual( self.assertEqual(
first_transaction_test_case._next_serialized_rollback, first_transaction_test_case._next_serialized_rollback,
middle_transaction_test_case.serialized_rollback second_transaction_test_case.serialized_rollback
) )
# TransactionTestCase2._next_serialized_rollback is # TransactionTestCase2._next_serialized_rollback is
# TransactionTestCase3.serialize_rollback. # TransactionTestCase4.serialize_rollback because TransactionTestCase3
# is skipped.
self.assertEqual( self.assertEqual(
middle_transaction_test_case._next_serialized_rollback, second_transaction_test_case._next_serialized_rollback,
last_transaction_test_case.serialized_rollback fourth_transaction_test_case.serialized_rollback
) )
# The last TransactionTestCase of the suite has # The last TransactionTestCase of the suite has
# _next_serialized_rollback to = True. # _next_serialized_rollback = True.
self.assertIs(last_transaction_test_case._next_serialized_rollback, True) self.assertIs(fourth_transaction_test_case._next_serialized_rollback, True)