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 branch '2017.7' into external_nodes_docs

Browse source
This commit is contained in:
Mike Place 2018-08-18 08:08:53 -04:00 • committed by GitHub
commit 4fe38dccbc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
tests/unit/states/test_file.py
View file

@ -769,6 +769,8 @@ class TestFileState(TestCase, LoaderModuleMockMixin):
name = '/etc/testdir'
user = 'salt'
group = 'saltstack'
if salt.utils.is_windows():
name = name.replace('/', '\\')
ret = {'name': name,
'result': False,
@ -865,12 +867,12 @@ class TestFileState(TestCase, LoaderModuleMockMixin):
else:
comt = ('The following files will be changed:\n{0}:'
' directory - new\n'.format(name))
p_chg = {'/etc/testdir': {'directory': 'new'}}
p_chg = {name: {'directory': 'new'}}
ret.update({
'comment': comt,
'result': None,
'pchanges': p_chg,
'changes': {'/etc/testdir': {'directory': 'new'}}
'changes': {name: {'directory': 'new'}}
})
self.assertDictEqual(filestate.directory(name,
user=user,
@ -917,6 +919,8 @@ class TestFileState(TestCase, LoaderModuleMockMixin):
source = 'salt://code/flask'
user = 'salt'
group = 'saltstack'
if salt.utils.is_windows():
name = name.replace('/', '\\')
ret = {'name': name,
'result': False,