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 #52146 from twangboy/fix_test_symlink_2019.2

Browse Source 
Add missing symlink test
This commit is contained in:
Daniel Wozniak 2019-04-11 17:51:15 -07:00 committed by GitHub
commit 1b969c39cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 36 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
tests/unit/modules/test_win_file.py
View File

@ -8,10 +8,10 @@ import os
import tempfile
# Import Salt Testing Libs
from tests.support.mixins import LoaderModuleMockMixin
from tests.support.unit import TestCase, skipIf
from tests.support.mock import patch, NO_MOCK, NO_MOCK_REASON
from tests.support.helpers import destructiveTest
from tests.support.mixins import LoaderModuleMockMixin
from tests.support.mock import patch, NO_MOCK, NO_MOCK_REASON
from tests.support.unit import TestCase, skipIf
# Import Salt Libs
import salt.modules.win_file as win_file
@ -22,7 +22,7 @@ import salt.utils.win_dacl
@skipIf(NO_MOCK, NO_MOCK_REASON)
class WinFileTestCase(TestCase):
class WinFileTestCase(TestCase, LoaderModuleMockMixin):
'''
Test cases for salt.modules.win_file
'''
@ -32,6 +32,13 @@ class WinFileTestCase(TestCase):
else:
FAKE_PATH = os.sep.join(['path', 'does', 'not', 'exist'])
def setup_loader_modules(self):
return {win_file: {
'__utils__': {
'dacl.set_perms': salt.utils.win_dacl.set_perms
}
}}
def test_issue_43328_stats(self):
'''
Make sure that a CommandExecutionError is raised if the file does NOT
@ -51,6 +58,31 @@ class WinFileTestCase(TestCase):
self.assertRaises(
CommandExecutionError, win_file.check_perms, self.FAKE_PATH)
@destructiveTest
@skipIf(not salt.utils.platform.is_windows(), 'Skip on Non-Windows systems')
def test_issue_52002_check_file_remove_symlink(self):
'''
Make sure that directories including symlinks or symlinks can be removed
'''
base = temp.dir(prefix='base-')
target = os.path.join(base, 'child 1', 'target\\')
symlink = os.path.join(base, 'child 2', 'link')
try:
# Create environment
self.assertFalse(win_file.directory_exists(target))
self.assertFalse(win_file.directory_exists(symlink))
self.assertTrue(win_file.makedirs_(target))
self.assertTrue(win_file.makedirs_(symlink))
self.assertTrue(win_file.symlink(target, symlink))
self.assertTrue(win_file.directory_exists(symlink))
self.assertTrue(win_file.is_link(symlink))
# Test removal of directory containing symlink
self.assertTrue(win_file.remove(base))
self.assertFalse(win_file.directory_exists(base))
finally:
if os.path.exists(base):
win_file.remove(base)
@destructiveTest
@skipIf(NO_MOCK, NO_MOCK_REASON)