mirror of
https://github.com/valitydev/salt.git
synced 2024-11-07 00:55:19 +00:00
clean up selinux unit test
This commit is contained in:
parent
96eabd4939
commit
d1b070c894
@ -37,13 +37,10 @@ class SelinuxTestCase(TestCase):
|
|||||||
Test to verifies the mode SELinux is running in,
|
Test to verifies the mode SELinux is running in,
|
||||||
can be set to enforcing or permissive.
|
can be set to enforcing or permissive.
|
||||||
'''
|
'''
|
||||||
ret = {'name': '',
|
ret = {'name': 'unknown',
|
||||||
'changes': {},
|
'changes': {},
|
||||||
'result': False,
|
'result': False,
|
||||||
'comment': ''}
|
'comment': 'unknown is not an accepted mode'}
|
||||||
|
|
||||||
comt = ('unknown is not an accepted mode')
|
|
||||||
ret.update({'name': 'unknown', 'comment': comt})
|
|
||||||
self.assertDictEqual(selinux.mode('unknown'), ret)
|
self.assertDictEqual(selinux.mode('unknown'), ret)
|
||||||
|
|
||||||
mock_en = MagicMock(return_value='Enforcing')
|
mock_en = MagicMock(return_value='Enforcing')
|
||||||
@ -52,24 +49,24 @@ class SelinuxTestCase(TestCase):
|
|||||||
{'selinux.getenforce': mock_en,
|
{'selinux.getenforce': mock_en,
|
||||||
'selinux.setenforce': mock_pr}):
|
'selinux.setenforce': mock_pr}):
|
||||||
comt = ('SELinux is already in Enforcing mode')
|
comt = ('SELinux is already in Enforcing mode')
|
||||||
ret.update({'name': 'Enforcing', 'comment': comt, 'result': True})
|
ret = {'name': 'Enforcing', 'comment': comt, 'result': True, 'changes': {}}
|
||||||
self.assertDictEqual(selinux.mode('Enforcing'), ret)
|
self.assertDictEqual(selinux.mode('Enforcing'), ret)
|
||||||
|
|
||||||
with patch.dict(selinux.__opts__, {'test': True}):
|
with patch.dict(selinux.__opts__, {'test': True}):
|
||||||
comt = ('SELinux mode is set to be changed to Permissive')
|
comt = ('SELinux mode is set to be changed to Permissive')
|
||||||
ret.update({'name': 'Permissive', 'comment': comt,
|
ret = {'name': 'Permissive', 'comment': comt,
|
||||||
'result': None})
|
'result': None, 'changes': {'new': 'Permissive', 'old': 'Enforcing'}}
|
||||||
self.assertDictEqual(selinux.mode('Permissive'), ret)
|
self.assertDictEqual(selinux.mode('Permissive'), ret)
|
||||||
|
|
||||||
with patch.dict(selinux.__opts__, {'test': False}):
|
with patch.dict(selinux.__opts__, {'test': False}):
|
||||||
comt = ('SELinux has been set to Permissive mode')
|
comt = ('SELinux has been set to Permissive mode')
|
||||||
ret.update({'name': 'Permissive', 'comment': comt,
|
ret = {'name': 'Permissive', 'comment': comt,
|
||||||
'result': True})
|
'result': True, 'changes': {'new': 'Permissive', 'old': 'Enforcing'}}
|
||||||
self.assertDictEqual(selinux.mode('Permissive'), ret)
|
self.assertDictEqual(selinux.mode('Permissive'), ret)
|
||||||
|
|
||||||
comt = ('Failed to set SELinux to Permissive mode')
|
comt = ('Failed to set SELinux to Permissive mode')
|
||||||
ret.update({'name': 'Permissive', 'comment': comt,
|
ret.update({'name': 'Permissive', 'comment': comt,
|
||||||
'result': False})
|
'result': False, 'changes': {}})
|
||||||
self.assertDictEqual(selinux.mode('Permissive'), ret)
|
self.assertDictEqual(selinux.mode('Permissive'), ret)
|
||||||
|
|
||||||
# 'boolean' function tests: 1
|
# 'boolean' function tests: 1
|
||||||
|
Loading…
Reference in New Issue
Block a user