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

Use file functions for symlink and remove

Browse Source
This commit is contained in:
twangboy 2017-09-13 14:50:30 -06:00
parent 72ac59c991
commit af5565859e
No known key found for this signature in database
GPG Key ID: 93FF3BDEB278C9EB
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -586,7 +586,7 @@ class FileTest(ModuleCase, SaltReturnAssertsMixin):
tmp_dir = os.path.join(TMP, 'pgdata')
sym_dir = os.path.join(TMP, 'pg_data')
os.mkdir(tmp_dir, 0o700)
os.symlink(tmp_dir, sym_dir)
self.run_function('file.symlink', [tmp_dir, sym_dir])
ret = self.run_state(
'file.directory', test=True, name=sym_dir, follow_symlinks=True,
@ -595,9 +595,9 @@ class FileTest(ModuleCase, SaltReturnAssertsMixin):
self.assertSaltTrueReturn(ret)
finally:
if os.path.isdir(tmp_dir):
shutil.rmtree(tmp_dir)
self.run_function('file.remove', [tmp_dir])
if os.path.islink(sym_dir):
os.unlink(sym_dir)
self.run_function('file.remove', [sym_dir])
@skip_if_not_root
@skipIf(IS_WINDOWS, 'Mode not available in Windows')