valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #49641 from rallytime/bp-49632

Browse Source 
Back-port #49632 to 2018.3.3
This commit is contained in:
Nicole Thomas 2018-09-13 12:46:01 -04:00 committed by GitHub
commit 3fb3ffdb37
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tests/integration/states/test_file.py
View File

@ -806,7 +806,13 @@ class FileTest(ModuleCase, SaltReturnAssertsMixin):
initial_mode = '0111' initial_mode = '0111'
changed_mode = '0555' changed_mode = '0555'
default_mode = '0755'
initial_modes = {0: {sub: '0755',
subsub: '0111'},
1: {sub: '0111',
subsub: '0111'},
2: {sub: '0111',
subsub: '0111'}}
if not os.path.isdir(subsub): if not os.path.isdir(subsub):
os.makedirs(subsub, int(initial_mode, 8)) os.makedirs(subsub, int(initial_mode, 8))
@ -827,7 +833,8 @@ class FileTest(ModuleCase, SaltReturnAssertsMixin):
# the mode of intermediate directories to the mode that # the mode of intermediate directories to the mode that
# is passed. # is passed.
if sys.version_info >= (3, 7): if sys.version_info >= (3, 7):
self.assertEqual(default_mode, _mode = initial_modes[depth][untouched_dir]
self.assertEqual(_mode,
_get_oct_mode(untouched_dir)) _get_oct_mode(untouched_dir))
else: else:
self.assertEqual(initial_mode, self.assertEqual(initial_mode,