From e96e93618c608a422a6fee81de2f932ca3094d81 Mon Sep 17 00:00:00 2001 From: Chris Jerdonek Date: Thu, 3 Jun 2021 18:17:44 -0700 Subject: [PATCH] Refs #32668 -- Passed setup()'s return value to run_tests() instead of get_installed(). --- tests/runtests.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/runtests.py b/tests/runtests.py index fe5642bbf5..6a1a4c829b 100755 --- a/tests/runtests.py +++ b/tests/runtests.py @@ -286,7 +286,8 @@ def setup(verbosity, start_at, start_after, test_labels=None): # Django's own test suite is running. os.environ['RUNNING_DJANGOS_TEST_SUITE'] = 'true' - return state + test_labels = test_labels or test_modules + return test_labels, state def teardown(state): @@ -338,7 +339,7 @@ def django_tests(verbosity, interactive, failfast, keepdb, reverse, msg += " with up to %d processes" % max_parallel print(msg) - state = setup(verbosity, start_at, start_after, test_labels) + test_labels, state = setup(verbosity, start_at, start_after, test_labels) # Run the test suite, including the extra validation tests. if not hasattr(settings, 'TEST_RUNNER'): settings.TEST_RUNNER = 'django.test.runner.DiscoverRunner' @@ -358,7 +359,7 @@ def django_tests(verbosity, interactive, failfast, keepdb, reverse, buffer=buffer, timing=timing, ) - failures = test_runner.run_tests(test_labels or get_installed()) + failures = test_runner.run_tests(test_labels) teardown(state) return failures