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

Fixed #32611 -- Prevented unecessary setup()/teardown() calls when using --bisect/--pair runtests options. 

This commit changes runtests.py's bisect_tests() and paired_tests() to
change settings only when necessary, namely when specific test names
aren't provided.
This commit is contained in:
Chris Jerdonek 2021-04-06 15:28:46 -07:00 committed by Mariusz Felisiak
parent aa4acc164d
commit 9fa8460081
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tests/runtests.py
View File

@ -334,6 +334,14 @@ def django_tests(verbosity, interactive, failfast, keepdb, reverse,
return failures return failures
def get_app_test_labels(verbosity, parallel, start_at, start_after):
test_labels = []
state = setup(verbosity, test_labels, parallel, start_at, start_after)
test_labels = get_installed()
teardown(state)
return test_labels
def get_subprocess_args(options): def get_subprocess_args(options):
subprocess_args = [ subprocess_args = [
sys.executable, __file__, '--settings=%s' % options.settings sys.executable, __file__, '--settings=%s' % options.settings
@ -352,9 +360,8 @@ def get_subprocess_args(options):
def bisect_tests(bisection_label, options, test_labels, parallel, start_at, start_after): def bisect_tests(bisection_label, options, test_labels, parallel, start_at, start_after):
state = setup(options.verbosity, test_labels, parallel, start_at, start_after) if not test_labels:
test_labels = get_app_test_labels(options.verbosity, parallel, start_at, start_after)
test_labels = test_labels or get_installed()
print('***** Bisecting test suite: %s' % ' '.join(test_labels)) print('***** Bisecting test suite: %s' % ' '.join(test_labels))
@ -399,13 +406,11 @@ def bisect_tests(bisection_label, options, test_labels, parallel, start_at, star
if len(test_labels) == 1: if len(test_labels) == 1:
print("***** Source of error: %s" % test_labels[0]) print("***** Source of error: %s" % test_labels[0])
teardown(state)
def paired_tests(paired_test, options, test_labels, parallel, start_at, start_after): def paired_tests(paired_test, options, test_labels, parallel, start_at, start_after):
state = setup(options.verbosity, test_labels, parallel, start_at, start_after) if not test_labels:
test_labels = get_app_test_labels(options.verbosity, parallel, start_at, start_after)
test_labels = test_labels or get_installed()
print('***** Trying paired execution') print('***** Trying paired execution')
@ -428,7 +433,6 @@ def paired_tests(paired_test, options, test_labels, parallel, start_at, start_af
return return
print('***** No problem pair found') print('***** No problem pair found')
teardown(state)
if __name__ == "__main__": if __name__ == "__main__":