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 #36747 from jfindlay/arch_test

Browse source 
modules.archive integration tests: check for gzip, rar
This commit is contained in:
Mike Place 2016-10-04 20:47:32 +09:00 • committed by GitHub
commit 5c0cbfc4c6
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
tests/integration/modules/archive.py
View file

@ -160,6 +160,7 @@ class ArchiveTest(integration.ModuleCase):
self._tear_down()
@skipIf(not salt.utils.which('gzip'), 'Cannot find gzip executable')
@skipIf(not salt.utils.which('gunzip'), 'Cannot find gunzip executable')
def test_gunzip(self):
'''
@ -205,7 +206,7 @@ class ArchiveTest(integration.ModuleCase):
self._tear_down()
@skipIf(not HAS_ZIPFILE, 'Cannot find zip python module')
@skipIf(not HAS_ZIPFILE, 'Cannot find zipfile python module')
def test_zip(self):
'''
Validate using the zip function
@ -219,7 +220,7 @@ class ArchiveTest(integration.ModuleCase):
self._tear_down()
@skipIf(not HAS_ZIPFILE, 'Cannot find zip python module')
@skipIf(not HAS_ZIPFILE, 'Cannot find zipfile python module')
def test_unzip(self):
'''
Validate using the unzip function
@ -248,7 +249,8 @@ class ArchiveTest(integration.ModuleCase):
self._tear_down()
@skipIf(not salt.utils.which_bin(('rar', 'unrar')), 'Cannot find rar or unrar executable')
@skipIf(not salt.utils.which('rar'), 'Cannot find rar executable')
@skipIf(not salt.utils.which('unrar'), 'Cannot find unrar executable')
def test_unrar(self):
'''
Validate using the unrar function