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] Make --clean-dest-dir work with partial imports #13929

Merged

Conversation

gsnedders
Copy link
Contributor

@gsnedders gsnedders commented May 16, 2023

3482356

[import-w3c-tests] Make --clean-dest-dir work with partial imports
https://bugs.webkit.org/show_bug.cgi?id=256751

Reviewed by Jonathan Bedard.

We need to do this slightly more lazily, and not just blanket clean
the entire destination directory.

Fix updating resource-files.json to write the file even if we aren't
importing new support files, as might be true of a partial import.

And finally fix removing items from tests-options.json to match
against the correct path, and avoid mutating the object we're
iterating over (which raises an RuntimeError).

* Tools/Scripts/webkitpy/w3c/test_importer.py:
(TestImporter.__init__):
(TestImporter.do_import):
(TestImporter.import_tests):
(TestImporter.remove_slow_from_w3c_tests_options):
* Tools/Scripts/webkitpy/w3c/test_importer_unittest.py:

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

dd3da92

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 βœ… πŸ›  gtk
βœ… πŸ§ͺ webkitpy βœ… πŸ§ͺ ios-wk2-wpt βœ… πŸ§ͺ mac-wk1 βœ… πŸ§ͺ gtk-wk2
βœ… πŸ§ͺ api-ios βœ… πŸ§ͺ mac-wk2 βœ… πŸ§ͺ api-gtk
βœ… πŸ›  tv βœ… πŸ§ͺ mac-AS-debug-wk2
βœ… πŸ›  tv-sim
βœ… πŸ›  watch
βœ… πŸ›  πŸ§ͺ unsafe-merge βœ… πŸ›  watch-sim

@gsnedders gsnedders self-assigned this May 16, 2023
@gsnedders gsnedders added the Tools / Tests Tools in the Tools directory, build issues, test infrastructure, and bugs in test cases label May 16, 2023
@gsnedders gsnedders requested a review from youennf May 17, 2023 10:42
@gsnedders
Copy link
Contributor Author

@youennf you'd asked for a unit-test for an earlier version of this in https://bugs.webkit.org/show_bug.cgi?id=235038; this finally does that, and fixes several bugs in the existing code now there's test coverage

@gsnedders gsnedders force-pushed the wpt-importer-clean-dest-dir-256751 branch from e2a657e to dd3da92 Compare May 19, 2023 09:01
@gsnedders gsnedders added the unsafe-merge-queue Applied to send a pull request to merge-queue, but skip building and testing label May 22, 2023
https://bugs.webkit.org/show_bug.cgi?id=256751

Reviewed by Jonathan Bedard.

We need to do this slightly more lazily, and not just blanket clean
the entire destination directory.

Fix updating resource-files.json to write the file even if we aren't
importing new support files, as might be true of a partial import.

And finally fix removing items from tests-options.json to match
against the correct path, and avoid mutating the object we're
iterating over (which raises an RuntimeError).

* Tools/Scripts/webkitpy/w3c/test_importer.py:
(TestImporter.__init__):
(TestImporter.do_import):
(TestImporter.import_tests):
(TestImporter.remove_slow_from_w3c_tests_options):
* Tools/Scripts/webkitpy/w3c/test_importer_unittest.py:

Canonical link: https://commits.webkit.org/264384@main
@webkit-commit-queue webkit-commit-queue force-pushed the wpt-importer-clean-dest-dir-256751 branch from dd3da92 to 3482356 Compare May 22, 2023 23:10
@webkit-commit-queue
Copy link
Collaborator

Committed 264384@main (3482356): https://commits.webkit.org/264384@main

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

@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 May 22, 2023
@webkit-commit-queue webkit-commit-queue merged commit 3482356 into WebKit:main May 22, 2023
@gsnedders gsnedders deleted the wpt-importer-clean-dest-dir-256751 branch May 22, 2023 23:32
@gsnedders gsnedders restored the wpt-importer-clean-dest-dir-256751 branch July 20, 2023 17:00
@gsnedders gsnedders deleted the wpt-importer-clean-dest-dir-256751 branch July 20, 2023 17:00
@gsnedders gsnedders restored the wpt-importer-clean-dest-dir-256751 branch July 20, 2023 17:00
@gsnedders gsnedders deleted the wpt-importer-clean-dest-dir-256751 branch July 20, 2023 17:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Tools / Tests Tools in the Tools directory, build issues, test infrastructure, and bugs in test cases
Projects
None yet
4 participants