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

Make has_json_wrapper and strip_json_wrapper private #21183

Merged
merged 1 commit into from
Dec 4, 2023

Conversation

gsnedders
Copy link
Contributor

@gsnedders gsnedders commented Dec 1, 2023

42db72e

Make has_json_wrapper and strip_json_wrapper private
https://bugs.webkit.org/show_bug.cgi?id=265692

Reviewed by Jonathan Bedard.

This makes it very obvious nothing is actually using these, and allows
us to have the confidence both JSON and JSONP work everywhere.

* Tools/Scripts/webkitpy/common/net/resultsjsonparser.py:
(ParsedJSONResults.__init__):
* Tools/Scripts/webkitpy/layout_tests/layout_package/json_results_generator.py:
(_has_json_wrapper):
(_strip_json_wrapper):
(load_json):
(load_jsons):
(has_json_wrapper): Deleted.
(strip_json_wrapper): Deleted.
* Tools/Scripts/webkitpy/layout_tests/layout_package/json_results_generator_unittest.py:
(JSONGeneratorTest.test_load_jsons):
(JSONGeneratorTest.test_strip_json_wrapper): Deleted.
* Tools/Scripts/webkitpy/tool/servers/rebaselineserver_unittest.py:
(RebaselineTestTest.test_gather_baselines):

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

841d81c

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
βœ… πŸ›  watch
βœ… πŸ›  πŸ§ͺ unsafe-merge βœ… πŸ›  watch-sim

@gsnedders gsnedders self-assigned this Dec 1, 2023
@gsnedders gsnedders added the Tools / Tests Tools in the Tools directory, build issues, test infrastructure, and bugs in test cases label Dec 1, 2023
@gsnedders gsnedders added the unsafe-merge-queue Applied to send a pull request to merge-queue, but skip building and testing label Dec 4, 2023
https://bugs.webkit.org/show_bug.cgi?id=265692

Reviewed by Jonathan Bedard.

This makes it very obvious nothing is actually using these, and allows
us to have the confidence both JSON and JSONP work everywhere.

* Tools/Scripts/webkitpy/common/net/resultsjsonparser.py:
(ParsedJSONResults.__init__):
* Tools/Scripts/webkitpy/layout_tests/layout_package/json_results_generator.py:
(_has_json_wrapper):
(_strip_json_wrapper):
(load_json):
(load_jsons):
(has_json_wrapper): Deleted.
(strip_json_wrapper): Deleted.
* Tools/Scripts/webkitpy/layout_tests/layout_package/json_results_generator_unittest.py:
(JSONGeneratorTest.test_load_jsons):
(JSONGeneratorTest.test_strip_json_wrapper): Deleted.
* Tools/Scripts/webkitpy/tool/servers/rebaselineserver_unittest.py:
(RebaselineTestTest.test_gather_baselines):

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

Committed 271505@main (42db72e): https://commits.webkit.org/271505@main

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

@webkit-commit-queue webkit-commit-queue merged commit 42db72e into WebKit:main Dec 4, 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 4, 2023
@gsnedders gsnedders deleted the json_wrapper_private branch December 4, 2023 21:34
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