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

Fix #18966 file.serialize correctly set result on test=True

Browse source 
* Use file.check_managed_changes to diff the file when test=True
This commit is contained in:
Nicholas Capo 2015-06-01 17:16:02 -05:00
parent 02bfb254d6
commit e7328e7043
2 changed files with 46 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
salt/states/file.py
View file

@ -4063,10 +4063,28 @@ def serialize(name,
}
if __opts__['test']:
ret['comment'] = (
'Dataset will be serialized and stored into {0}'
).format(name)
ret['result'] = None
ret['changes'] = __salt__['file.check_managed_changes'](
name=name,
source=None,
source_hash={},
user=user,
group=group,
mode=mode,
template=None,
context=None,
defaults=None,
saltenv=__env__,
contents=contents,
**kwargs
)
if ret['changes']:
ret['result'] = None
ret['comment'] = 'Dataset will be serialized and stored into {0}'.format(name)
else:
ret['result'] = True
ret['comment'] = 'The file {0} is in the correct state'.format(name)
return ret
return __salt__['file.manage_file'](name=name,

30
tests/unit/states/file_test.py
View file

@ -126,6 +126,7 @@ class TestFileState(TestCase):
@skipIf(NO_MOCK, NO_MOCK_REASON)
class FileTestCase(TestCase):
'''
Test cases for salt.states.file
'''
@ -1501,13 +1502,30 @@ class FileTestCase(TestCase):
ret.update({'comment': comt, 'result': False})
self.assertDictEqual(filestate.serialize(name, dataset=True,
formatter='A'), ret)
mock_changes = MagicMock(return_value=True)
mock_no_changes = MagicMock(return_value=False)
with patch.dict(filestate.__opts__, {'test': True}):
comt = ('Dataset will be serialized and stored into {0}'
.format(name))
ret.update({'comment': comt, 'result': None})
self.assertDictEqual(filestate.serialize(name, dataset=True,
formatter='python'), ret)
# __opts__['test']=True with changes
with patch.dict(filestate.__salt__,
{'file.check_managed_changes': mock_changes}):
with patch.dict(filestate.__opts__, {'test': True}):
comt = ('Dataset will be serialized and stored into {0}'
.format(name))
ret.update({'comment': comt, 'result': None, 'changes': True})
self.assertDictEqual(
filestate.serialize(name, dataset=True,
formatter='python'), ret)
# __opts__['test']=True without changes
with patch.dict(filestate.__salt__,
{'file.check_managed_changes': mock_no_changes}):
with patch.dict(filestate.__opts__, {'test': True}):
comt = ('The file {0} is in the correct state'
.format(name))
ret.update({'comment': comt, 'result': True, 'changes': False})
self.assertDictEqual(
filestate.serialize(name,
dataset=True, formatter='python'), ret)
mock = MagicMock(return_value=ret)
with patch.dict(filestate.__opts__, {'test': False}):