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

Merge pull request #14495 from cro/rhel7_pkgtests2

Browse Source 
Extend dot-in-pkg test to RHEL 5 as well
This commit is contained in:
Nicole Thomas 2014-07-25 12:55:09 -06:00
commit 0674839ecd
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/integration/states/pkg.py
View File

@ -37,8 +37,9 @@ _PKG_TARGETS_32 = {
# Test packages with dot in pkg name
# (https://github.com/saltstack/salt/issues/8614)
_PKG_TARGETS_DOT = {
'RedHat': { '6': 'tomcat6-el-2.1-api',
'7': 'tomcat-el-2.2-api' }
'RedHat': {'5': 'python-migrate0.5',
'6': 'tomcat6-el-2.1-api',
'7': 'tomcat-el-2.2-api'}
}
@ -267,7 +268,10 @@ class PkgTest(integration.ModuleCase,
'''
os_family = grains.get('os_family', '')
os_version = grains.get('osmajorrelease', [''])[0]
target = _PKG_TARGETS_DOT.get(os_family, '').get(os_version, '')
if os_family in _PKG_TARGETS_DOT:
target = _PKG_TARGETS_DOT.get(os_family, '').get(os_version, '')
else:
target = None
if target:
ret = self.run_state('pkg.installed', name=target)
self.assertSaltTrueReturn(ret)