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

Fix archive tests on Windows platform

Browse source
This commit is contained in:
Daniel A. Wozniak 2018-08-26 19:05:07 -07:00
parent 06f271ff19
commit 1765d53367
No known key found for this signature in database
GPG key ID: 166B9D2C06C82D61
2 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
tests/integration/modules/test_archive.py
View file

@ -50,12 +50,12 @@ class ArchiveTest(ModuleCase):
:param str arch_fmt: The archive format used in the test
'''
# Setup artifact paths
self._set_artifact_paths(arch_fmt)
# Remove the artifacts if any present
if any([os.path.exists(f) for f in (self.src, self.arch, self.dst)]):
self._tear_down()
self._set_artifact_paths(arch_fmt)
# Create source
os.makedirs(self.src)
@ -97,19 +97,30 @@ class ArchiveTest(ModuleCase):
del self.arch
del self.src_file
def _assert_artifacts_in_ret(self, ret, file_only=False):
def _assert_artifacts_in_ret(self, ret, file_only=False, unix_sep=False):
'''
Assert that the artifact source files are printed in the source command
output
'''
def normdir(path):
normdir = os.path.normcase(os.path.abspath(path))
if salt.utils.platform.is_windows():
if len(normdir) >= 2 and normdir[1] == ':':
normdir = normdir.split(':', 1)[1]
normdir = normdir.lstrip(os.path.sep)
if unix_sep:
normdir = normdir.replace(os.path.sep, '/')
return normdir
# Try to find source directory and file in output lines
dir_in_ret = None
file_in_ret = None
for line in ret:
if self.src.lstrip('/') in line \
and not self.src_file.lstrip('/') in line:
if normdir(self.src) in line \
and not normdir(self.src_file) in line:
dir_in_ret = True
if self.src_file.lstrip('/') in line:
if normdir(self.src_file) in line:
file_in_ret = True
# Assert number of lines, reporting of source directory and file
@ -231,8 +242,8 @@ class ArchiveTest(ModuleCase):
# Test create archive
ret = self.run_function('archive.unzip', [self.arch, self.dst])
self.assertTrue(isinstance(ret, list), str(ret))
self._assert_artifacts_in_ret(ret)
self.assertTrue(isinstance(ret, list), six.text_type(ret))
self._assert_artifacts_in_ret(ret, unix_sep=True)
self._tear_down()

1
tests/whitelist.txt
View file

@ -7,6 +7,7 @@ integration.client.test_standard
integration.client.test_syndic
integration.doc.test_man
integration.grains.test_core
integration.grains.test_custom
integration.loader.test_ext_grains
integration.loader.test_ext_modules
integration.logging.test_jid_logging