project: ensure yaml load returns a dictionary #2517
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
PyYAML yaml loading and parsing can return None if given an empty file or empty string. When validating its yaml file, Snapcraft expects the result to be subscriptable, so return an empty dictionary instead of None. Fixes SNAPCRAFT-JQ Signed-off-by: Claudio Matsuoka <claudio.matsuoka@canonical.com>
sergiusens
reviewed
Mar 27, 2019
| @@ -86,4 +86,7 @@ def _load_yaml(*, yaml_file_path: str) -> OrderedDict: | |||
| except yaml.YAMLError as e: | |||
| raise errors.YamlValidationError(str(e), yaml_file_path) from e | |||
|
|
|||
| if yaml_contents is None: | |||
There was a problem hiding this comment.
Can you add a unit test for this, one that of an empty file and validate that the instantiation of a ProjectInfo returns the correct YamlValidationError?
sergiusens
requested changes
Mar 27, 2019
Signed-off-by: Claudio Matsuoka <claudio.matsuoka@canonical.com>
Codecov Report
@@ Coverage Diff @@
## master #2517 +/- ##
=========================================
Coverage ? 90.03%
=========================================
Files ? 198
Lines ? 13388
Branches ? 2024
=========================================
Hits ? 12054
Misses ? 908
Partials ? 426
Continue to review full report at Codecov.
|
sergiusens
approved these changes
Mar 27, 2019
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.
PyYAML yaml loading and parsing can return None if given an empty file
or empty string. When validating its yaml file, Snapcraft expects the
result to be subscriptable, so return an empty dictionary instead of None.
Fixes SNAPCRAFT-JQ
Signed-off-by: Claudio Matsuoka claudio.matsuoka@canonical.com
./runtests.sh static?./runtests.sh tests/unit?