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 pkg hold/unhold integration test

Browse source
This commit is contained in:
Justin Findlay 2015-06-01 11:30:02 -06:00
parent 73cd2cbe1f
commit c2db0b1758
1 changed files with 22 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
tests/integration/modules/pkg.py
View file

@ -57,7 +57,8 @@ class PkgModuleTest(integration.ModuleCase,
ret = self.run_function(func, [repo, 'comps=main'])
self.assertNotEqual(ret, {})
if os_release.startswith('12.'):
self.assertIn(repo, ret.keys()[0])
self.assertIn(repo, ret)
self.assertTrue(ret[repo]['result'])
else:
self.assertIn(uri, ret.keys()[0])
@ -109,16 +110,31 @@ class PkgModuleTest(integration.ModuleCase,
'''
test holding and unholding a package
'''
func = 'pkg.hold'
pkg = 'htop'
os_family = self.run_function('grains.item', ['os_family'])['os_family']
available = self.run_function('sys.doc', ['pkg.hold'])
if available:
if os_family == 'RedHat':
versionlock = self.run_function('pkg.version', ['yum-plugin-versionlock'])
if not versionlock:
self.run_function('pkg.install', ['yum-plugin-versionlock'])
hold_ret = self.run_function('pkg.hold', [pkg])
self.assertIn(pkg, hold_ret)
self.assertTrue(hold_ret[pkg]['result'])
unhold_ret = self.run_function('pkg.unhold', [pkg])
self.assertIn(pkg, unhold_ret)
self.assertTrue(hold_ret[pkg]['result'])
if os_family == 'RedHat':
if not versionlock:
self.run_function('pkg.remove', ['yum-plugin-versionlock'])
if os_family == 'RedHat':
self.run_function('pkg.install', ['yum-plugin-versionlock'])
ret = self.run_function(func, [pkg])
else:
os_grain = self.run_function('grains.item', ['os'])['os']
self.skipTest('{0} is unavailable on {1}'.format(func, os_grain))
self.skipTest('{0} is unavailable on {1}'.format('pkg.hold', os_grain))
@requires_network()
@destructiveTest