saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Don't change perms list, only existing perms should be a dictionary.

Browse source 
Refs #28269
This commit is contained in:
rallytime 2015-11-11 12:31:51 -07:00
parent 7601647d69
commit e2b0fee57e
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
salt/states/rabbitmq_user.py
View file

@ -171,7 +171,7 @@ def present(name,
{'old': tags,
'new': new_tags}})
try:
existing_perms = __salt__['rabbitmq.list_user_permissions'](name, runas=runas)[0]
existing_perms = __salt__['rabbitmq.list_user_permissions'](name, runas=runas)
except CommandExecutionError as err:
ret['comment'] = 'Error: {0}'.format(err)
return ret

5
tests/unit/states/rabbitmq_user_test.py
View file

@ -39,7 +39,8 @@ class RabbitmqUserTestCase(TestCase):
name = 'foo'
passwd = 'password'
tag = 'user'
perms = [{'/': ['.*', '.*']}]
existing_perms = {'/': ['.*', '.*']}
perms = [existing_perms]
ret = {'name': name,
'changes': {},
@ -49,7 +50,7 @@ class RabbitmqUserTestCase(TestCase):
mock = MagicMock(side_effect=[True, False, True, True,
True, True, True])
mock_dct = MagicMock(return_value={name: set(tag)})
mock_pr = MagicMock(return_value=perms)
mock_pr = MagicMock(return_value=existing_perms)
mock_add = MagicMock(return_value={'Added': name})
with patch.dict(rabbitmq_user.__salt__,
{'rabbitmq.user_exists': mock,