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 #45768 from garethgreenaway/724_py2_pkg_tests_failing

Browse Source 
[oxygen] fixes to integration.modules.test_pkg.PkgModuleTest.test_pkg_upgrade_has_pending_upgrades
This commit is contained in:
Nicole Thomas 2018-01-30 09:30:26 -05:00 committed by GitHub
commit 3221d734d4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/integration/modules/test_pkg.py
View File

@ -308,16 +308,7 @@ class PkgModuleTest(ModuleCase, SaltReturnAssertsMixin):
self.skipTest('No updates available for this machine. Skipping pkg.upgrade test.')
else:
ret = self.run_function(func)
if 'Problem encountered' in ret:
self.skipTest('A problem was encountered when running pkg.upgrade. This test is '
'meant to catch no-ops or problems with the salt function itself, '
'not problems with actual package installation. Skipping.')
# The changes dictionary should not be empty.
self.assertNotEqual(ret, {})
if 'changes' in ret:
self.assertNotEqual(ret['changes'], {})
@destructiveTest
@skipIf(salt.utils.platform.is_windows(), 'minion is windows')