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 branch '2015.5' into '2015.8'

Browse source 
No conflicts.
This commit is contained in:
rallytime 2016-05-10 11:58:55 -06:00
commit 449176f06e
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
tests/integration/shell/call.py
View file

@ -82,6 +82,7 @@ class CallTest(integration.ShellCase, integration.ShellCaseCommonTestsMixIn):
self.assertIn('Succeeded: 1', ''.join(out))
@destructiveTest
@skipIf(True, 'Skipping due to off the wall failures and hangs on most os\'s. Will re-enable when fixed.')
@skipIf(sys.platform.startswith('win'), 'This test does not apply on Win')
def test_local_pkg_install(self):
'''