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

Refs #32668 -- Passed setup()'s return value to run_tests() instead of get_installed().

Browse Source
This commit is contained in:
Chris Jerdonek 2021-06-03 18:17:44 -07:00 committed by Mariusz Felisiak
parent b3083d5bd2
commit e96e93618c
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/runtests.py
View File

@ -286,7 +286,8 @@ def setup(verbosity, start_at, start_after, test_labels=None):
# Django's own test suite is running. # Django's own test suite is running.
os.environ['RUNNING_DJANGOS_TEST_SUITE'] = 'true' os.environ['RUNNING_DJANGOS_TEST_SUITE'] = 'true'
return state test_labels = test_labels or test_modules
return test_labels, state
def teardown(state): def teardown(state):
@ -338,7 +339,7 @@ def django_tests(verbosity, interactive, failfast, keepdb, reverse,
msg += " with up to %d processes" % max_parallel msg += " with up to %d processes" % max_parallel
print(msg) 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. # Run the test suite, including the extra validation tests.
if not hasattr(settings, 'TEST_RUNNER'): if not hasattr(settings, 'TEST_RUNNER'):
settings.TEST_RUNNER = 'django.test.runner.DiscoverRunner' settings.TEST_RUNNER = 'django.test.runner.DiscoverRunner'
@ -358,7 +359,7 @@ def django_tests(verbosity, interactive, failfast, keepdb, reverse,
buffer=buffer, buffer=buffer,
timing=timing, timing=timing,
) )
failures = test_runner.run_tests(test_labels or get_installed()) failures = test_runner.run_tests(test_labels)
teardown(state) teardown(state)
return failures return failures