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 #42257 from twangboy/win_unit_pillar_test_git

Browse source 
Fix `unit.pillar.test_git` for Windows
This commit is contained in:
Mike Place 2017-07-17 12:51:41 -05:00 • committed by GitHub
commit 3ec5bb1c2f
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
tests/unit/pillar/test_git.py
View file

@ -16,6 +16,7 @@ import tempfile
import shutil
import subprocess
import yaml
import stat
# Import Salt Testing libs
from tests.integration import AdaptedConfigurationTestCaseMixin
@ -72,9 +73,13 @@ class GitPillarTestCase(TestCase, AdaptedConfigurationTestCaseMixin, LoaderModul
git_pillar._update('master', 'file://{0}'.format(self.repo_path))
def tearDown(self):
shutil.rmtree(self.tmpdir)
shutil.rmtree(self.tmpdir, onerror=self._rmtree_error)
super(GitPillarTestCase, self).tearDown()
def _rmtree_error(self, func, path, excinfo):
os.chmod(path, stat.S_IWRITE)
func(path)
def _create_repo(self):
'create source Git repo in temp directory'
repo = os.path.join(self.tmpdir, 'repo_pillar')