Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[import-w3c-tests] Explicitly list all directories we're not importing as skip #19642

Merged

Conversation

gsnedders
Copy link
Contributor

@gsnedders gsnedders commented Oct 27, 2023

e5fd5e0

[import-w3c-tests] Explicitly list all directories we're not importing as skip
https://bugs.webkit.org/show_bug.cgi?id=214006

Reviewed by Jonathan Bedard.

Add a new value to import-expectations.json: "skip-new-directories".

"skip-new-directories" is mostly treated the same as "skip" (i.e.,
everything under it is skipped, unless marked as "import"). However,
unlike "skip", child files are imported, and child directories are added
to import-expectations.json as "skip" (thus the name).

We apply this to both "web-platform-tests" and "web-platform-tests/css",
to avoid importing new test suites for (presumably new) specifications.

By doing this, as opposed to applying "skip" directly to those
directories, we gain visibility to new test suites being added, as these
now cause a "skip" line to be added when doing a full import.

* LayoutTests/imported/w3c/resources/import-expectations.json:
* Tools/Scripts/webkitpy/style/checkers/jsonchecker.py:
(JSONImportExpectationsChecker.check):
* Tools/Scripts/webkitpy/w3c/test_downloader.py:
(TestDownloader.__init__):
(TestDownloader._init_paths_from_expectations):
(TestDownloader.update_import_expectations):
* Tools/Scripts/webkitpy/w3c/test_importer.py:
(TestImporter.__init__):
(TestImporter.do_import):
(TestImporter.should_skip_path):

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

5973c45

Misc iOS, tvOS & watchOS macOS Linux Windows
  πŸ§ͺ style   πŸ›  ios   πŸ›  mac   πŸ›  wpe   πŸ›  wincairo
  πŸ§ͺ bindings   πŸ›  ios-sim   πŸ›  mac-AS-debug   πŸ§ͺ wpe-wk2
  πŸ§ͺ webkitperl   πŸ§ͺ ios-wk2   πŸ§ͺ api-mac   πŸ§ͺ api-wpe
  πŸ§ͺ webkitpy   πŸ§ͺ ios-wk2-wpt   πŸ§ͺ mac-wk1   πŸ›  gtk
  πŸ§ͺ api-ios   πŸ§ͺ mac-wk2   πŸ§ͺ gtk-wk2
  πŸ›  tv   πŸ§ͺ mac-AS-debug-wk2   πŸ§ͺ api-gtk
  πŸ›  tv-sim   πŸ§ͺ mac-wk2-stress
  πŸ›  watch
  πŸ›  πŸ§ͺ unsafe-merge   πŸ›  watch-sim

@gsnedders gsnedders self-assigned this Oct 27, 2023
@gsnedders gsnedders added the Tools / Tests Tools in the Tools directory, build issues, test infrastructure, and bugs in test cases label Oct 27, 2023
@gsnedders
Copy link
Contributor Author

(This builds on top of #19442, still in review.)

@nt1m
Copy link
Member

nt1m commented Oct 27, 2023

Not sure explicit-skip is the best name. skip-new-directories ?

@marcoscaceres
Copy link
Contributor

Agree with @nt1m... the name could be improved but I don't have a better suggestion than what Tim proposed.

@gsnedders gsnedders force-pushed the import-expectations-explicit-skip branch from 5781a96 to 163e0e3 Compare November 10, 2023 12:15
@gsnedders gsnedders force-pushed the import-expectations-explicit-skip branch from 163e0e3 to 70ff1a4 Compare December 14, 2023 21:20
@gsnedders gsnedders force-pushed the import-expectations-explicit-skip branch from 70ff1a4 to 4abc16a Compare December 14, 2023 21:31
@gsnedders gsnedders force-pushed the import-expectations-explicit-skip branch from 4abc16a to 5b14200 Compare December 14, 2023 21:38
@gsnedders gsnedders force-pushed the import-expectations-explicit-skip branch from 5b14200 to 5973c45 Compare December 15, 2023 12:39
@gsnedders gsnedders added unsafe-merge-queue Applied to send a pull request to merge-queue, but skip building and testing skip-ews Applied to prevent a change from being run on EWS labels Dec 15, 2023
…g as skip

https://bugs.webkit.org/show_bug.cgi?id=214006

Reviewed by Jonathan Bedard.

Add a new value to import-expectations.json: "skip-new-directories".

"skip-new-directories" is mostly treated the same as "skip" (i.e.,
everything under it is skipped, unless marked as "import"). However,
unlike "skip", child files are imported, and child directories are added
to import-expectations.json as "skip" (thus the name).

We apply this to both "web-platform-tests" and "web-platform-tests/css",
to avoid importing new test suites for (presumably new) specifications.

By doing this, as opposed to applying "skip" directly to those
directories, we gain visibility to new test suites being added, as these
now cause a "skip" line to be added when doing a full import.

* LayoutTests/imported/w3c/resources/import-expectations.json:
* Tools/Scripts/webkitpy/style/checkers/jsonchecker.py:
(JSONImportExpectationsChecker.check):
* Tools/Scripts/webkitpy/w3c/test_downloader.py:
(TestDownloader.__init__):
(TestDownloader._init_paths_from_expectations):
(TestDownloader.update_import_expectations):
* Tools/Scripts/webkitpy/w3c/test_importer.py:
(TestImporter.__init__):
(TestImporter.do_import):
(TestImporter.should_skip_path):

Canonical link: https://commits.webkit.org/272109@main
@webkit-commit-queue
Copy link
Collaborator

Committed 272109@main (e5fd5e0): https://commits.webkit.org/272109@main

Reviewed commits have been landed. Closing PR #19642 and removing active labels.

@webkit-commit-queue webkit-commit-queue merged commit e5fd5e0 into WebKit:main Dec 15, 2023
@webkit-commit-queue webkit-commit-queue removed the unsafe-merge-queue Applied to send a pull request to merge-queue, but skip building and testing label Dec 15, 2023
@gsnedders gsnedders deleted the import-expectations-explicit-skip branch December 15, 2023 14:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
skip-ews Applied to prevent a change from being run on EWS Tools / Tests Tools in the Tools directory, build issues, test infrastructure, and bugs in test cases
Projects
None yet
6 participants