Merge pull request #24287 from jfindlay/pkg_test

fix pkg test on ubuntu 12.04 for realz
This commit is contained in:
Nicole Thomas 2015-06-01 08:16:37 -06:00
commit 73cd2cbe1f

View file

@ -45,11 +45,11 @@ class PkgModuleTest(integration.ModuleCase,
@destructiveTest
def test_mod_del_repo(self):
'''
test modifying a software repository
test modifying and deleting a software repository
'''
func = 'pkg.mod_repo'
os_grain = self.run_function('grains.item', ['os'])['os']
os_release = self.run_function('grains.item', ['os_release'])['os_release']
os_release = self.run_function('grains.item', ['osrelease'])['osrelease']
if os_grain == 'Ubuntu':
repo = 'ppa:saltstack/salt'