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

Fix up fileserver.test_gitfs tests on windows

Browse Source
This commit is contained in:
Daniel A. Wozniak 2018-08-22 06:40:50 +00:00
parent 800aa254c6
commit 74527158ec
No known key found for this signature in database
GPG Key ID: 166B9D2C06C82D61
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/unit/fileserver/test_gitfs.py
View File

@ -62,6 +62,8 @@ log = logging.getLogger(__name__)
TMP_SOCK_DIR = tempfile.mkdtemp(dir=TMP)
TMP_REPO_DIR = os.path.join(TMP, 'gitfs_root')
if salt.utils.platform.is_windows():
TMP_REPO_DIR = TMP_REPO_DIR.replace('\\', '/')
INTEGRATION_BASE_FILES = os.path.join(FILES, 'file', 'base')
UNICODE_FILENAME = 'питон.txt'
UNICODE_DIRNAME = UNICODE_ENVNAME = 'соль'
@ -422,6 +424,7 @@ class GitFSTestBase(object):
# Add a tag
repo.create_tag(TAG_NAME, 'HEAD')
repo.close()
finally:
if orig_username is not None:
os.environ[username_key] = orig_username
@ -436,10 +439,12 @@ class GitFSTestBase(object):
'''
for path in (cls.tmp_cachedir, cls.tmp_sock_dir, TMP_REPO_DIR):
try:
shutil.rmtree(path, onerror=_rmtree_error)
salt.utils.files.rm_rf(path)
except OSError as exc:
if exc.errno != errno.EEXIST:
raise
except Exception:
log.exception("Exception encountered durring recursive remove: %s", path)
def setUp(self):
'''
@ -457,7 +462,7 @@ class GitFSTestBase(object):
_clear_instance_map()
for subdir in ('gitfs', 'file_lists'):
try:
shutil.rmtree(os.path.join(self.tmp_cachedir, subdir))
salt.utils.files.rm_rf(os.path.join(self.tmp_cachedir, subdir))
except OSError as exc:
if exc.errno != errno.ENOENT:
raise