[master] Porting #52933 to master #54576
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
ghost
requested review from
garethgreenaway
changed the title
dwoz
approved these changes
Oct 28, 2019
s0undt3ch
approved these changes
Oct 28, 2019
| @@ -117,6 +117,10 @@ def validate(config): | |||
| if 'files' not in _config: | |||
| return False, 'Configuration for inotify beacon must include files.' | |||
| else: | |||
| if not isinstance(_config['files'], dict): | |||
There was a problem hiding this comment.
I would remove the above else and dedent this logic.
| @@ -39,10 +39,33 @@ def setUp(self): | |||
| def tearDown(self): | |||
| shutil.rmtree(self.tmpdir, ignore_errors=True) | |||
|
|
|||
| def test_non_list_config(self): | |||
| config = {} | |||
There was a problem hiding this comment.
Unnecessary variable, just pass {} to inotify.validate().
|
|
||
| self.assertEqual(ret, (False, 'Configuration for inotify beacon must' | ||
| ' be a list.')) | ||
|
|
||
| def test_empty_config(self): | ||
| config = [{}] |
| self.assertEqual(ret, _expected) | ||
|
|
||
| def test_files_none_config(self): | ||
| config = [{'files': None}] |
There was a problem hiding this comment.
I won't say same as above here, although we don't actually use config anywhere else.
But for the sake of readability, let's leave it.
The same for the next test.
dhiltonp
reviewed
Oct 29, 2019
| if not isinstance(_config['files'], dict): | ||
| return False, ('Configuration for inotify beacon invalid, ' | ||
| 'files must be a dict.') | ||
|
|
||
| for path in _config.get('files'): | ||
|
|
||
| if not isinstance(_config['files'][path], dict): |
There was a problem hiding this comment.
Configuration for inotify beacon must be a list of dictionaries.
This error is not correct, it must be a dict of dicts (which this PR validates).
dhiltonp
approved these changes
Nov 15, 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.
Porting #52933 to master