mirror of
https://github.com/saltstack/salt.git
synced 2025-04-17 10:10:20 +00:00
fix state/reg unit tests
This commit is contained in:
parent
3f74a389ce
commit
3348b726c9
1 changed files with 24 additions and 9 deletions
|
@ -43,11 +43,13 @@ class RegTestCase(TestCase):
|
|||
ret = {'name': name,
|
||||
'changes': {},
|
||||
'result': True,
|
||||
'comment': '{0} is already configured'.format(name)}
|
||||
'comment': '{0} in {1} is already configured'.format(vname, name)}
|
||||
|
||||
mock = MagicMock(side_effect=[{'vdata': vdata}, {'vdata': 'a'}, {'vdata': 'a'}])
|
||||
mock_read = MagicMock(side_effect=[{'vdata': vdata, 'success': True},
|
||||
{'vdata': 'a', 'success': True},
|
||||
{'vdata': 'a', 'success': True}])
|
||||
mock_t = MagicMock(return_value=True)
|
||||
with patch.dict(reg.__salt__, {'reg.read_value': mock,
|
||||
with patch.dict(reg.__salt__, {'reg.read_value': mock_read,
|
||||
'reg.set_value': mock_t}):
|
||||
self.assertDictEqual(reg.present(name,
|
||||
vname=vname,
|
||||
|
@ -55,13 +57,19 @@ class RegTestCase(TestCase):
|
|||
|
||||
with patch.dict(reg.__opts__, {'test': True}):
|
||||
ret.update({'comment': '', 'result': None,
|
||||
'changes': {'reg': 'configured to 0.15.3'}})
|
||||
'changes': {'reg': {'Will add': {'Key': name,
|
||||
'Entry': vname,
|
||||
'Value': vdata}}}})
|
||||
self.assertDictEqual(reg.present(name,
|
||||
vname=vname,
|
||||
vdata=vdata), ret)
|
||||
|
||||
with patch.dict(reg.__opts__, {'test': False}):
|
||||
ret.update({'result': True})
|
||||
ret.update({'comment': 'Added {0} to {0}'.format(name),
|
||||
'result': True,
|
||||
'changes': {'reg': {'Added': {'Key': name,
|
||||
'Entry': vname,
|
||||
'Value': vdata}}}})
|
||||
self.assertDictEqual(reg.present(name,
|
||||
vname=vname,
|
||||
vdata=vdata), ret)
|
||||
|
@ -80,19 +88,26 @@ class RegTestCase(TestCase):
|
|||
'result': True,
|
||||
'comment': '{0} is already absent'.format(name)}
|
||||
|
||||
mock = MagicMock(side_effect=[{'success': False}, {'success': True}, {'success': True}])
|
||||
mock_read = MagicMock(side_effect=[{'success': False},
|
||||
{'success': False},
|
||||
{'success': True},
|
||||
{'success': True}])
|
||||
mock_t = MagicMock(return_value=True)
|
||||
with patch.dict(reg.__salt__, {'reg.read_value': mock,
|
||||
with patch.dict(reg.__salt__, {'reg.read_value': mock_read,
|
||||
'reg.delete_value': mock_t}):
|
||||
self.assertDictEqual(reg.absent(name, vname), ret)
|
||||
|
||||
with patch.dict(reg.__opts__, {'test': True}):
|
||||
ret.update({'comment': '', 'result': None,
|
||||
'changes': {'reg': 'Removed {0}'.format(name)}})
|
||||
'changes': {'reg': {'Will remove': {'Entry': vname,
|
||||
'Key': name}}}})
|
||||
self.assertDictEqual(reg.absent(name, vname), ret)
|
||||
|
||||
with patch.dict(reg.__opts__, {'test': False}):
|
||||
ret.update({'result': True})
|
||||
ret.update({'result': True,
|
||||
'changes': {'reg': {'Removed': {'Entry': vname,
|
||||
'Key': name}}},
|
||||
'comment': 'Removed {0} from {0}'.format(name)})
|
||||
self.assertDictEqual(reg.absent(name, vname), ret)
|
||||
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue