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 #36981 from rallytime/upgrades-test-fix

Browse source 
Skip pkg.upgrades test on distros other that Suse in 2016.3
This commit is contained in:
C. R. Oldham 2016-10-13 15:29:36 -06:00 • committed by GitHub
commit c7595b84a7
1 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -275,14 +275,9 @@ class PkgModuleTest(integration.ModuleCase,
self.assertIn('changes', ret)
self.assertIn('vim', ret['changes'])
else:
ret = self.run_function('pkg.list_updates')
if ret == '' or ret == {}:
self.skipTest('No updates available for this machine. Skipping pkg.upgrade test.')
else:
ret = self.run_function(func)
# The changes dictionary should not be empty.
self.assertNotEqual(ret, {})
self.skipTest('This test is meant to catch a no-op bug in Suse. Other distros should be '
'skipped on the 2016.3 branch as there is no way to check for pkg upgrade '
'problems before Carbon. See PRs #36450 and #36980 for a better test.')
if __name__ == '__main__':