innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Refs #32668 -- Changed bisect_tests() and paired_tests() to use only setup_collect_tests().

This commit is contained in:
Chris Jerdonek 2021-06-03 20:55:16 -07:00 committed by Mariusz Felisiak
parent e96e93618c
commit 9389d4d3db
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
tests/runtests.py
View File

@ -241,6 +241,12 @@ def setup_collect_tests(start_at, start_after, test_labels=None):
return test_modules, state return test_modules, state
def teardown_collect_tests(state):
# Restore the old settings.
for key, value in state.items():
setattr(settings, key, value)
def get_installed(): def get_installed():
return [app_config.name for app_config in apps.get_app_configs()] return [app_config.name for app_config in apps.get_app_configs()]
@ -291,9 +297,7 @@ def setup(verbosity, start_at, start_after, test_labels=None):
def teardown(state): def teardown(state):
# Restore the old settings. teardown_collect_tests(state)
for key, value in state.items():
setattr(settings, key, value)
# Discard the multiprocessing.util finalizer that tries to remove a # Discard the multiprocessing.util finalizer that tries to remove a
# temporary directory that's already removed by this script's # temporary directory that's already removed by this script's
# atexit.register(shutil.rmtree, TMPDIR) handler. Prevents # atexit.register(shutil.rmtree, TMPDIR) handler. Prevents
@ -364,11 +368,10 @@ def django_tests(verbosity, interactive, failfast, keepdb, reverse,
return failures return failures
def get_app_test_labels(verbosity, start_at, start_after): def collect_test_modules(start_at, start_after):
state = setup(verbosity, start_at, start_after) test_modules, state = setup_collect_tests(start_at, start_after)
test_labels = get_installed() teardown_collect_tests(state)
teardown(state) return test_modules
return test_labels
def get_subprocess_args(options): def get_subprocess_args(options):
@ -390,7 +393,7 @@ def get_subprocess_args(options):
def bisect_tests(bisection_label, options, test_labels, start_at, start_after): def bisect_tests(bisection_label, options, test_labels, start_at, start_after):
if not test_labels: if not test_labels:
test_labels = get_app_test_labels(options.verbosity, start_at, start_after) test_labels = collect_test_modules(start_at, start_after)
print('***** Bisecting test suite: %s' % ' '.join(test_labels)) print('***** Bisecting test suite: %s' % ' '.join(test_labels))
@ -439,7 +442,7 @@ def bisect_tests(bisection_label, options, test_labels, start_at, start_after):
def paired_tests(paired_test, options, test_labels, start_at, start_after): def paired_tests(paired_test, options, test_labels, start_at, start_after):
if not test_labels: if not test_labels:
test_labels = get_app_test_labels(options.verbosity, start_at, start_after) test_labels = collect_test_modules(start_at, start_after)
print('***** Trying paired execution') print('***** Trying paired execution')