Title: [273844] trunk/Tools
- Revision
- 273844
- Author
- commit-qu...@webkit.org
- Date
- 2021-03-03 14:55:56 -0800 (Wed, 03 Mar 2021)
Log Message
Move LayoutTestFinder.skip_tests to Manager._skip_tests
https://bugs.webkit.org/show_bug.cgi?id=222661
Patch by Sam Sneddon <gsnedd...@apple.com> on 2021-03-03
Reviewed by Jonathan Bedard.
This has nothing to do with finding tests, and everything to do about
test selection depending on the CLI.
Additionally, this removes the unused LayoutTestFinder.skip_tests
all_tests_list argument.
* Scripts/webkitpy/layout_tests/controllers/layout_test_finder.py:
(LayoutTestFinder._skip_tests):
* Scripts/webkitpy/layout_tests/controllers/manager.py:
(Manager._skip_tests):
(Manager._prepare_lists):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (273843 => 273844)
--- trunk/Tools/ChangeLog 2021-03-03 22:39:29 UTC (rev 273843)
+++ trunk/Tools/ChangeLog 2021-03-03 22:55:56 UTC (rev 273844)
@@ -1,3 +1,23 @@
+2021-03-03 Sam Sneddon <gsnedd...@apple.com>
+
+ Move LayoutTestFinder.skip_tests to Manager._skip_tests
+ https://bugs.webkit.org/show_bug.cgi?id=222661
+
+ Reviewed by Jonathan Bedard.
+
+ This has nothing to do with finding tests, and everything to do about
+ test selection depending on the CLI.
+
+ Additionally, this removes the unused LayoutTestFinder.skip_tests
+ all_tests_list argument.
+
+ * Scripts/webkitpy/layout_tests/controllers/layout_test_finder.py:
+ (LayoutTestFinder._skip_tests):
+ * Scripts/webkitpy/layout_tests/controllers/manager.py:
+ (Manager._skip_tests):
+ (Manager._prepare_lists):
+
+
2021-03-03 Aakash Jain <aakash_j...@apple.com>
[ews] Add python 3 support - part 4
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/controllers/layout_test_finder.py (273843 => 273844)
--- trunk/Tools/Scripts/webkitpy/layout_tests/controllers/layout_test_finder.py 2021-03-03 22:39:29 UTC (rev 273843)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/controllers/layout_test_finder.py 2021-03-03 22:55:56 UTC (rev 273844)
@@ -189,25 +189,6 @@
else:
return line
- def skip_tests(self, paths, all_tests_list, expectations, http_tests):
- all_tests = set(all_tests_list)
-
- tests_to_skip = expectations.model().get_tests_with_result_type(test_expectations.SKIP)
- if self._options.skip_failing_tests:
- tests_to_skip.update(expectations.model().get_tests_with_result_type(test_expectations.FAIL))
- tests_to_skip.update(expectations.model().get_tests_with_result_type(test_expectations.FLAKY))
-
- if self._options.skipped == 'only':
- tests_to_skip = all_tests - tests_to_skip
- elif self._options.skipped == 'ignore':
- tests_to_skip = set()
-
- # unless of course we don't want to run the HTTP tests :)
- if not self._options.http:
- tests_to_skip.update(set(http_tests))
-
- return tests_to_skip
-
def split_into_chunks(self, test_names):
"""split into a list to run and a set to skip, based on --run-chunk and --run-part."""
if not self._options.run_chunk and not self._options.run_part:
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py (273843 => 273844)
--- trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py 2021-03-03 22:39:29 UTC (rev 273843)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py 2021-03-03 22:55:56 UTC (rev 273844)
@@ -109,8 +109,27 @@
def _http_tests(self, test_names):
return set(test for test in test_names if self._is_http_test(test))
+ def _skip_tests(self, all_tests_list, expectations, http_tests):
+ all_tests = set(all_tests_list)
+
+ tests_to_skip = expectations.model().get_tests_with_result_type(test_expectations.SKIP)
+ if self._options.skip_failing_tests:
+ tests_to_skip.update(expectations.model().get_tests_with_result_type(test_expectations.FAIL))
+ tests_to_skip.update(expectations.model().get_tests_with_result_type(test_expectations.FLAKY))
+
+ if self._options.skipped == 'only':
+ tests_to_skip = all_tests - tests_to_skip
+ elif self._options.skipped == 'ignore':
+ tests_to_skip = set()
+
+ # unless of course we don't want to run the HTTP tests :)
+ if not self._options.http:
+ tests_to_skip.update(set(http_tests))
+
+ return tests_to_skip
+
def _prepare_lists(self, paths, test_names, device_type=None):
- tests_to_skip = self._finder.skip_tests(paths, test_names, self._expectations[device_type], self._http_tests(test_names))
+ tests_to_skip = self._skip_tests(test_names, self._expectations[device_type], self._http_tests(test_names))
tests_to_run = [test for test in test_names if test not in tests_to_skip]
# Create a sorted list of test files so the subset chunk,
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
