mirror of
https://github.com/servo/servo.git
synced 2025-06-08 16:43:28 +00:00
python: Cleanup run_tests_or_dispatch.
This commit is contained in:
parent
333c397f03
commit
d9d78bf5d4
1 changed files with 11 additions and 13 deletions
|
@ -408,19 +408,17 @@ class MachCommands(CommandBase):
|
|||
def run_test_list_or_dispatch(self, requested_paths, correct_suite, correct_function, **kwargs):
|
||||
if not requested_paths:
|
||||
return correct_function(**kwargs)
|
||||
else:
|
||||
# Paths specified on command line. Ensure they can be handled, re-dispatch otherwise.
|
||||
all_handled = True
|
||||
for test_path in requested_paths:
|
||||
suite = self.suite_for_path(test_path)
|
||||
if suite is not None and correct_suite != suite:
|
||||
all_handled = False
|
||||
print("Warning: %s is not a %s test. Delegating to test-%s." % (test_path, correct_suite, suite))
|
||||
if all_handled:
|
||||
return correct_function(**kwargs)
|
||||
else:
|
||||
# Dispatch each test to the correct suite via test()
|
||||
Registrar.dispatch("test", context=self.context, params=requested_paths)
|
||||
# Paths specified on command line. Ensure they can be handled, re-dispatch otherwise.
|
||||
all_handled = True
|
||||
for test_path in requested_paths:
|
||||
suite = self.suite_for_path(test_path)
|
||||
if suite is not None and correct_suite != suite:
|
||||
all_handled = False
|
||||
print("Warning: %s is not a %s test. Delegating to test-%s." % (test_path, correct_suite, suite))
|
||||
if all_handled:
|
||||
return correct_function(**kwargs)
|
||||
# Dispatch each test to the correct suite via test()
|
||||
Registrar.dispatch("test", context=self.context, params=requested_paths)
|
||||
|
||||
# Helper for test_css and test_wpt:
|
||||
def wptrunner(self, run_file, **kwargs):
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue