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 #41968 from root360-AndreasUlm/fix-rabbitmqctl-output-handler

Browse source 
Fix rabbitmqctl output sanitizer for version 3.6.10
This commit is contained in:
Mike Place 2017-07-25 14:12:36 -05:00 • committed by GitHub
commit 641a9d7efd
2 changed files with 25 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
salt/modules/rabbitmq.py
View file

@ -72,6 +72,7 @@ def _safe_output(line):
'''
return not any([
line.startswith('Listing') and line.endswith('...'),
line.startswith('Listing') and '\t' not in line,
'...done' in line,
line.startswith('WARNING:')
])

24
tests/unit/modules/rabbitmq_test.py
View file

@ -52,6 +52,17 @@ class RabbitmqTestCase(TestCase):
with patch.dict(rabbitmq.__salt__, {'cmd.run': mock_run}):
self.assertDictEqual(rabbitmq.list_users(), {'guest': ['administrator', 'user']})
# 'list_users_rabbitmq4' function tests: 1
def test_list_users_rabbitmq4(self):
'''
Test if it return a list of users based off of rabbitmqctl user_list.
Output changed in rabbitmq-server version 3.6.10
'''
mock_run = MagicMock(return_value='Listing users\nguest\t[administrator user]\n')
with patch.dict(rabbitmq.__salt__, {'cmd.run': mock_run}):
self.assertDictEqual(rabbitmq.list_users(), {'guest': ['administrator', 'user']})
# 'list_users_with_warning_rabbitmq2' function tests: 1
def test_list_users_with_warning_rabbitmq2(self):
@ -220,6 +231,19 @@ class RabbitmqTestCase(TestCase):
self.assertDictEqual(rabbitmq.list_user_permissions('myuser'),
{'saltstack': ['saltstack']})
# 'list_user_permissions2' function tests: 1
def test_list_user_permissions2(self):
'''
Test if it list permissions for a user
via rabbitmqctl list_user_permissions.
Output changed in rabbitmq-server version 3.6.10
'''
mock_run = MagicMock(return_value='Listing stuff\nsaltstack\tsaltstack\n...done')
with patch.dict(rabbitmq.__salt__, {'cmd.run': mock_run}):
self.assertDictEqual(rabbitmq.list_user_permissions('myuser'),
{'saltstack': ['saltstack']})
# 'set_user_tags' function tests: 1
def test_set_user_tags(self):