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 #30459 from jfindlay/pkg_tests

Browse source 
modules.pkg: disable repo int test for ubuntu 15.10
This commit is contained in:
Mike Place 2016-01-20 09:41:12 -07:00
commit 5c7cc51937
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -51,14 +51,14 @@ class PkgModuleTest(integration.ModuleCase,
'''
func = 'pkg.mod_repo'
os_grain = self.run_function('grains.item', ['os'])['os']
os_release = self.run_function('grains.item', ['osrelease'])['osrelease']
os_release_info = tuple(self.run_function('grains.item', ['osrelease_info'])['osrelease_info'])
if os_grain == 'Ubuntu':
if os_grain == 'Ubuntu' and os_release_info < (15, 10):
repo = 'ppa:saltstack/salt'
uri = 'http://ppa.launchpad.net/saltstack/salt/ubuntu'
ret = self.run_function(func, [repo, 'comps=main'])
self.assertNotEqual(ret, {})
if os_release.startswith('12.'):
if os_release_info[0] == 12:
self.assertIn(repo, ret)
else:
self.assertIn(uri, ret.keys()[0])