valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-06 08:35:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactored test_version

Browse Source
This commit is contained in:
Tyler Johnson 2019-10-04 14:37:14 -06:00
parent 70e6c076f7
commit aaadc9beae
No known key found for this signature in database
GPG Key ID: 691E31397E27D004
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tests/integration/modules/test_pkg.py
View File

@ -29,12 +29,14 @@ class PkgModuleTest(ModuleCase, SaltReturnAssertsMixin):
@requires_system_grains
def setUpClass(cls, grains):
cls.ctx = {}
cls.pkg = 'htop'
cls.pkg = 'figlet'
if salt.utils.platform.is_windows():
cls.pkg = 'putty'
elif salt.utils.platform.is_darwin():
if int(grains['osmajorrelease']) >= 13:
cls.pkg = 'wget'
elif grains['os_family'] == 'RedHat':
cls.pkg = 'units'
def setUp(self):
if 'refresh' not in self.ctx:
@ -340,17 +342,7 @@ class PkgModuleTest(ModuleCase, SaltReturnAssertsMixin):
Check that pkg.latest_version returns the latest version of the uninstalled package.
The package is not installed. Only the package version is checked.
'''
remove = False
if salt.utils.platform.is_windows():
cmd_info = self.run_function('pkg.version', [self.pkg])
remove = cmd_info != ''
else:
cmd_info = self.run_function('pkg.info_installed', [self.pkg])
remove = cmd_info != 'ERROR: package {0} is not installed'.format(self.pkg)
# remove package if it's installed
if remove:
self.run_function('pkg.remove', [self.pkg])
self.run_state('pkg.removed', name=self.pkg)
cmd_pkg = []
if grains['os_family'] == 'RedHat':
@ -363,7 +355,9 @@ class PkgModuleTest(ModuleCase, SaltReturnAssertsMixin):
cmd_pkg = self.run_function('cmd.run', ['pacman -Si {0}'.format(self.pkg)])
elif grains['os_family'] == 'Suse':
cmd_pkg = self.run_function('cmd.run', ['zypper info {0}'.format(self.pkg)])
elif grains['os_family'] == 'MacOS':
cmd_pkg = self.run_function('cmd.run', ['brew info {0}'.format(self.pkg)])
else:
self.skipTest('test not configured for {}'.format(grains['os_family']))
self.skipTest('TODO: test not configured for {}'.format(grains['os_family']))
pkg_latest = self.run_function('pkg.latest_version', [self.pkg])
self.assertIn(pkg_latest, cmd_pkg)