Refs #32668 -- Simplified start_at/start_after logic in runtests.py's setup().

This commit is contained in:
Chris Jerdonek 2021-06-05 07:46:37 -07:00 committed by GitHub
parent d6f3b58589
commit 9812b486b5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions

View File

@ -223,16 +223,16 @@ def setup(verbosity, start_at, start_after, test_labels=None):
# Exact or ancestor match. # Exact or ancestor match.
return module_name == label or module_name.startswith(label + '.') return module_name == label or module_name.startswith(label + '.')
found_start = not (start_at or start_after) start_label = start_at or start_after
installed_app_names = set(get_installed()) installed_app_names = set(get_installed())
for test_module in get_test_modules(): for test_module in get_test_modules():
if not found_start: if start_label:
if start_at and _module_match_label(test_module, start_at): if not _module_match_label(test_module, start_label):
found_start = True
elif start_after and _module_match_label(test_module, start_after):
found_start = True
continue continue
else: start_label = ''
if not start_at:
assert start_after
# Skip the current one before starting.
continue continue
# if the module (or an ancestor) was named on the command line, or # if the module (or an ancestor) was named on the command line, or
# no modules were named (i.e., run all), import # no modules were named (i.e., run all), import