Merge branch '2017.7.6' into '2017.7'

No conflicts.
This commit is contained in:
rallytime 2018-05-22 11:26:44 -04:00
commit 17596f3025
No known key found for this signature in database
GPG key ID: E8F1A4B90D0DEA19

View file

@ -220,6 +220,7 @@ class CMDMODTestCase(TestCase, LoaderModuleMockMixin):
self.assertRaises(CommandExecutionError, cmdmod._run, 'foo')
@skipIf(salt.utils.is_windows(), 'Do not run on Windows')
@skipIf(True, 'Test breaks unittests runs')
def test_run(self):
'''
Tests end result when a command is not found