aboutsummaryrefslogtreecommitdiffstats
path: root/python/servo/testing_commands.py
diff options
context:
space:
mode:
authorEmilio Cobos Álvarez <ecoal95@gmail.com>2016-11-09 11:56:45 +0100
committerEmilio Cobos Álvarez <ecoal95@gmail.com>2016-11-09 11:57:08 +0100
commitd9d78bf5d460bddfdb2b5ef98f1d77703e3811f2 (patch)
treec89f18d02fad4c24b0d6409b82e0aae1367c616d /python/servo/testing_commands.py
parent333c397f03bc2d143e0d8c112138d5758d37f6f5 (diff)
downloadservo-d9d78bf5d460bddfdb2b5ef98f1d77703e3811f2.tar.gz
servo-d9d78bf5d460bddfdb2b5ef98f1d77703e3811f2.zip
python: Cleanup run_tests_or_dispatch.
Diffstat (limited to 'python/servo/testing_commands.py')
-rw-r--r--python/servo/testing_commands.py24
1 files changed, 11 insertions, 13 deletions
diff --git a/python/servo/testing_commands.py b/python/servo/testing_commands.py
index fdb471a437d..f24750df245 100644
--- a/python/servo/testing_commands.py
+++ b/python/servo/testing_commands.py
@@ -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):