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

Merge pull request #28782 from rallytime/rabbitmq-user-state

Browse source 
Fixes to rabbitmq user state
This commit is contained in:
Nicole Thomas 2015-11-11 17:59:57 -07:00
commit 59b505ff7c
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
salt/states/rabbitmq_user.py
View file

@ -56,12 +56,13 @@ def _check_perms_changes(name, newperms, runas=None, existing=None):
return False
perm_need_change = False
for vhost, perms in newperms.iteritems():
if vhost in existing:
if perms != existing[vhost]:
for vhost_perms in newperms:
for vhost, perms in vhost_perms.iteritems():
if vhost in existing:
if perms != existing[vhost]:
perm_need_change = True
else:
perm_need_change = True
else:
perm_need_change = True
return perm_need_change

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,