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. --- django/test/runner.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'django') diff --git a/django/test/runner.py b/django/test/runner.py index aa2b269fab..7dc28587af 100644 --- a/django/test/runner.py +++ b/django/test/runner.py @@ -646,7 +646,12 @@ def reorder_postprocess(reordered_suite): If the next test has no serialized_rollback attribute, it means there 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) if next_serialized_rollback is not None: previous_test._next_serialized_rollback = next_serialized_rollback -- cgit v1.3