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

Merge pull request #14493 from thatch45/2014.7

Browse Source 
Merge #14475 with lint fixes
This commit is contained in:
Thomas S Hatch 2014-07-25 10:41:20 -06:00
commit 831021fe6a
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/states/pkg.py
View File

@ -37,7 +37,8 @@ _PKG_TARGETS_32 = {
# Test packages with dot in pkg name
# (https://github.com/saltstack/salt/issues/8614)
_PKG_TARGETS_DOT = {
'CentOS': 'jboss-annotations-1.1-api-javadoc'
'RedHat': { '6': 'tomcat6-el-2.1-api',
'7': 'tomcat-el-2.2-api' }
}
@ -264,8 +265,9 @@ class PkgTest(integration.ModuleCase,
This is a destructive test as it installs a package
'''
os_name = grains.get('os', '')
target = _PKG_TARGETS_DOT.get(os_name, '')
os_family = grains.get('os_family', '')
os_version = grains.get('osmajorrelease', [''])[0]
target = _PKG_TARGETS_DOT.get(os_family, '').get(os_version, '')
if target:
ret = self.run_state('pkg.installed', name=target)
self.assertSaltTrueReturn(ret)