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.

Sign up for GitHub

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

[master] Porting #52933 to master #54576

Merged
merged 4 commits into from
Nov 15, 2019
Merged

[master] Porting #52933 to master #54576

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fb956bb
Porting PR #52933 to 2019.2.1
garethgreenaway Sep 19, 2019
ebf8f3d
Merge branch 'master' into 2019_2_1_port_52933
dwoz Oct 28, 2019
c42547e
Merge branch 'master' into 2019_2_1_port_52933
dwoz Nov 7, 2019
183bfa4
Merge branch 'master' into 2019_2_1_port_52933
dwoz Nov 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions salt/beacons/inotify.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would remove the above else and dedent this logic.

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):
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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).

Expand Down
27 changes: 25 additions & 2 deletions tests/unit/beacons/test_inotify.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,33 @@ def setUp(self):
def tearDown(self):
shutil.rmtree(self.tmpdir, ignore_errors=True)

def test_non_list_config(self):
config = {}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unnecessary variable, just pass {} to inotify.validate().


ret = inotify.validate(config)

self.assertEqual(ret, (False, 'Configuration for inotify beacon must'
' be a list.'))

def test_empty_config(self):
config = [{}]
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same as above.

ret = inotify.beacon(config)
self.assertEqual(ret, [])
ret = inotify.validate(config)
_expected = (False, 'Configuration for inotify beacon must include files.')
self.assertEqual(ret, _expected)

def test_files_none_config(self):
config = [{'files': None}]
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

ret = inotify.validate(config)
_expected = (False, 'Configuration for inotify beacon invalid, '
'files must be a dict.')
self.assertEqual(ret, _expected)

def test_files_list_config(self):
config = [{'files': [{u'/importantfile': {u'mask': [u'modify']}}]}]
ret = inotify.validate(config)
_expected = (False, 'Configuration for inotify beacon invalid, '
'files must be a dict.')
self.assertEqual(ret, _expected)

def test_file_open(self):
path = os.path.realpath(__file__)
Expand Down