corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

servo: Merge #14150 - python: Cleanup run_tests_or_dispatch to avod rightward drift (from emilio:cleanup-py); r=Ms2ger

Browse Source 
<!-- Please describe your changes on the following line: -->

r? @aneeshusa (or anyone else really).

Source-Repo: https://github.com/servo/servo
Source-Revision: 77c1f6fb553d3dbe7890d15dd1c29c16d400bf61
This commit is contained in:
Emilio Cobos Álvarez
2016-11-09 20:43:29 -06:00
parent 8ca6d6715a
commit ecde57fa90
1 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
servo/python/servo/testing_commands.py
View File

@@ -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):