Handle the case when MANIFEST.json is invalid JSON #10323
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
I don't know how I got into this situation (probably hit ctrl-C at the wrong time) but I did and it was unclear how to get out. It presents as a ValueError with no useful info. Update the code to handle ValueError to log a warning and cause a full regen of the manifest. Also reported in https://crbug.com/822041
gsnedders
reviewed
Apr 4, 2018
| @@ -225,6 +225,9 @@ def load(tests_root, manifest): | |||
| rv = Manifest.from_json(tests_root, json.load(f)) | |||
| except IOError: | |||
| return None | |||
| except ValueError: | |||
There was a problem hiding this comment.
I created another branch base on that suggestion.
https://github.com/fergald/web-platform-tests/tree/fergald-patch-2
Let me know what you think.
fergald
changed the title
Build PASSEDStarted: 2018-04-05 00:51:04 View more information about this build on: |
jgraham
approved these changes
Apr 5, 2018
aarongable
pushed a commit
to chromium/chromium
that referenced
this pull request
Apr 5, 2018
This roll is mainly to include web-platform-tests/wpt#10323, which fixes a bug that `wpt manifest` would fail when the local manifest is invalid. wpt.config.json is changed to accomodate: web-platform-tests/wpt#9998 web-platform-tests/wpt#10078 Bug: 822041 Change-Id: I074afd90e32db299fc6f58b870f9b72576fab225 Reviewed-on: https://chromium-review.googlesource.com/997764 Reviewed-by: Quinten Yearsley <qyearsley@chromium.org> Commit-Queue: Robert Ma <robertma@chromium.org> Cr-Commit-Position: refs/heads/master@{#548584}
aarongable
pushed a commit
to chromium/chromium
that referenced
this pull request
Apr 6, 2018
This CL contains some code health improvements as a by product of fixing issue 822041. Though the root cause of that issue was eventually fixed from upstream (web-platform-tests/wpt#10323), these improvements are still good to have. * WPTManifest raises an exception when `wpt manifest` fails instead of directy exiting the process. Subprocess invocation is simplified. * lint-test-expectations now has a --verbose flag to print debug logs, including error messages from subprocesses (i.e. `wpt manifest`). * Use the canonical configure_logging in lint-test-expectations and LoggingTestCase in its unit test. Also make the unit test stricter as PRESUBMIT.py relies on the output. Bug: 822041 Change-Id: I4724904c61b3c5b6ed3239584ed03089f2b203ce Reviewed-on: https://chromium-review.googlesource.com/998341 Reviewed-by: Quinten Yearsley <qyearsley@chromium.org> Commit-Queue: Robert Ma <robertma@chromium.org> Cr-Commit-Position: refs/heads/master@{#548632}
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I don't know how I got into this situation (probably hit ctrl-C at the wrong time) but I did and it was unclear how to get out. It presents as a ValueError with no useful info.
Update the code to handle ValueError to log a warning and cause a full regen of the manifest.
Also reported in https://crbug.com/822041
This change is