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

Revision field in the json data generated by run-webkit-tests is empty since migration to git #4152

Merged
merged 1 commit into from Sep 12, 2022

Conversation

clopez
Copy link
Contributor

@clopez clopez commented Sep 9, 2022

ee1be47

Revision field in the json data generated by run-webkit-tests is empty since migration to git
https://bugs.webkit.org/show_bug.cgi?id=244960

Reviewed by Jonathan Bedard.

The script run-webkit-tests generates a json file with the information of
the test run (usually named full_results.json).

This json included a "revision" field with the SVN revision of the checkout.
But since the migration to git this "revision" field is null.

Fix it by setting as revision number the canonical identifier "number@main"
if available, otherwise default to the git commit hash.

* Tools/Scripts/webkitpy/layout_tests/models/test_run_results.py:
(summarize_results):
* Tools/Scripts/webkitpy/layout_tests/models/test_run_results_unittest.py:
(SummarizedResultsTest.test_no_git_revision):
(SummarizedResultsTest.test_git_revision_exists):
(SummarizedResultsTest.test_git_revision_identifier):
(SummarizedResultsTest.test_no_svn_revision): Deleted.
(SummarizedResultsTest.test_svn_revision_exists): Deleted.
(SummarizedResultsTest.test_svn_revision): Deleted.
(SummarizedResultsTest.test_svn_revision_git): Deleted.

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

d312ea9

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

@clopez clopez self-assigned this Sep 9, 2022
@clopez clopez added Tools / Tests Tools in the Tools directory, build issues, test infrastructure, and bugs in test cases WebKit Nightly Build labels Sep 9, 2022
@webkit-ews-buildbot webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Sep 12, 2022
@clopez clopez added merge-queue Applied to send a pull request to merge-queue and removed merging-blocked Applied to prevent a change from being merged merge-queue Applied to send a pull request to merge-queue labels Sep 12, 2022
…y since migration to git

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

Reviewed by Jonathan Bedard.

The script run-webkit-tests generates a json file with the information of
the test run (usually named full_results.json).

This json included a "revision" field with the SVN revision of the checkout.
But since the migration to git this "revision" field is null.

Fix it by setting as revision number the canonical identifier "number@main"
if available, otherwise default to the git commit hash.

* Tools/Scripts/webkitpy/layout_tests/models/test_run_results.py:
(summarize_results):
* Tools/Scripts/webkitpy/layout_tests/models/test_run_results_unittest.py:
(SummarizedResultsTest.test_no_git_revision):
(SummarizedResultsTest.test_git_revision_exists):
(SummarizedResultsTest.test_git_revision_identifier):
(SummarizedResultsTest.test_no_svn_revision): Deleted.
(SummarizedResultsTest.test_svn_revision_exists): Deleted.
(SummarizedResultsTest.test_svn_revision): Deleted.
(SummarizedResultsTest.test_svn_revision_git): Deleted.

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

Committed 254376@main (ee1be47): https://commits.webkit.org/254376@main

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

@webkit-early-warning-system webkit-early-warning-system merged commit ee1be47 into WebKit:main Sep 12, 2022
@webkit-commit-queue webkit-commit-queue removed the merge-queue Applied to send a pull request to merge-queue label Sep 12, 2022
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
5 participants