[webkit-changes] [WebKit/WebKit] 4d0923: Clean up import-expectations.json

Sam Sneddon noreply at github.com
Mon Oct 30 05:30:16 PDT 2023


  Branch: refs/heads/main
  Home:   https://github.com/WebKit/WebKit
  Commit: 4d09238f938d67cf7d3bf9fa83bac1f1f96e5551
      https://github.com/WebKit/WebKit/commit/4d09238f938d67cf7d3bf9fa83bac1f1f96e5551
  Author: Sam Sneddon <gsnedders at apple.com>
  Date:   2023-10-30 (Mon, 30 Oct 2023)

  Changed paths:
    M LayoutTests/imported/w3c/resources/import-expectations.json
    M Tools/Scripts/webkitpy/style/checker.py
    M Tools/Scripts/webkitpy/style/checkers/jsonchecker.py
    M Tools/Scripts/webkitpy/style/checkers/jsonchecker_unittest.py
    M Tools/Scripts/webkitpy/w3c/test_downloader.py

  Log Message:
  -----------
  Clean up import-expectations.json
https://bugs.webkit.org/show_bug.cgi?id=232787

Reviewed by Jonathan Bedard.

This adds a style checker for import-expectations.json, and fixes
everything in the file to pass the new checker. The checker checks:

 * Schema,
 * That 'skip'/'import' status matches the tree,
 * That there are no redundant lines (as values are inherited),
 * That all paths imported are directories.

Note this takes what we have imported as the ground truth (i.e., if
import-expectations.json currently has 'skip' but we actually have it
imported, change that to 'import').

Additionally, stop the TestDownloader from adding more redundant lines.

And finally, remove skip lines that refer to paths that no longer exist
in upstream WPT.

* LayoutTests/imported/w3c/resources/import-expectations.json:
* Tools/Scripts/webkitpy/style/checker.py:
(CheckerDispatcher._create_checker):
* Tools/Scripts/webkitpy/style/checkers/jsonchecker.py:
(JSONChecker.__init__):
(JSONCSSPropertiesChecker.check_codegen_properties):
(JSONImportExpectationsChecker):
(JSONImportExpectationsChecker.check):
* Tools/Scripts/webkitpy/style/checkers/jsonchecker_unittest.py:
* Tools/Scripts/webkitpy/w3c/test_downloader.py:
(TestDownloader.update_import_expectations):

Canonical link: https://commits.webkit.org/269935@main




More information about the webkit-changes mailing list