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 module integration tests on ubuntu 12

Browse source
This commit is contained in:
Justin Findlay 2015-06-11 12:46:22 -06:00
parent 26930b45bd
commit fb91b40ba0
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -58,7 +58,6 @@ class PkgModuleTest(integration.ModuleCase,
self.assertNotEqual(ret, {})
if os_release.startswith('12.'):
self.assertIn(repo, ret)
self.assertTrue(ret[repo]['result'])
else:
self.assertIn(uri, ret.keys()[0])
@ -88,6 +87,13 @@ class PkgModuleTest(integration.ModuleCase,
'''
pkg = 'htop'
version = self.run_function('pkg.version', [pkg])
os_grain = self.run_function('grains.item', ['os'])['os']
os_release = self.run_function('grains.item', ['osrelease'])['osrelease']
if os_grain == 'Ubuntu':
if os_release.startswith('12.'):
self.skipTest('pkg.install and pkg.remove do not work on ubuntu '
'12 when run from the test suite')
def test_install():
install_ret = self.run_function('pkg.install', [pkg])