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 #49173 from Ch3LL/bp-49167

Browse source 
[2018.3.3] cherry pick #49167
This commit is contained in:
Daniel Wozniak 2018-08-17 13:30:26 -07:00 • committed by GitHub
commit 85ffc8db87
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
salt/states/file.py
View file

@ -2987,7 +2987,7 @@ def directory(name,
perms: full_control
- win_inheritance: False
'''
name = os.path.expanduser(name)
name = os.path.normcase(os.path.expanduser(name))
ret = {'name': name,
'changes': {},
'pchanges': {},
@ -3515,7 +3515,7 @@ def recurse(name,
# "env" is not supported; Use "saltenv".
kwargs.pop('env')
name = os.path.expanduser(sdecode(name))
name = os.path.normcase(os.path.expanduser(sdecode(name)))
user = _test_owner(kwargs, user=user)
if salt.utils.platform.is_windows():

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

@ -267,7 +267,7 @@ class FileTest(ModuleCase, SaltReturnAssertsMixin):
if IS_WINDOWS:
expected = 'The \'mode\' option is not supported on Windows'
self.assertEqual(ret[ret.keys()[0]]['comment'], expected)
self.assertEqual(ret[list(ret)[0]]['comment'], expected)
self.assertSaltFalseReturn(ret)
return
@ -303,7 +303,7 @@ class FileTest(ModuleCase, SaltReturnAssertsMixin):
if IS_WINDOWS:
expected = 'The \'mode\' option is not supported on Windows'
self.assertEqual(ret[ret.keys()[0]]['comment'], expected)
self.assertEqual(ret[list(ret)[0]]['comment'], expected)
self.assertSaltFalseReturn(ret)
return
@ -335,7 +335,7 @@ class FileTest(ModuleCase, SaltReturnAssertsMixin):
if IS_WINDOWS:
expected = 'The \'mode\' option is not supported on Windows'
self.assertEqual(ret[ret.keys()[0]]['comment'], expected)
self.assertEqual(ret[list(ret)[0]]['comment'], expected)
self.assertSaltFalseReturn(ret)
return
@ -418,7 +418,7 @@ class FileTest(ModuleCase, SaltReturnAssertsMixin):
)
if IS_WINDOWS:
expected = 'The \'mode\' option is not supported on Windows'
self.assertEqual(ret[ret.keys()[0]]['comment'], expected)
self.assertEqual(ret[list(ret)[0]]['comment'], expected)
self.assertSaltFalseReturn(ret)
return