mirror of
https://github.com/saltstack/salt.git
synced 2025-04-17 10:10:20 +00:00
Skipping integration.modules.test_cp.CPModuleTest.test_get_file_str_https on OS X
This commit is contained in:
parent
c02db20cb1
commit
01dafdc6fc
1 changed files with 2 additions and 0 deletions
|
@ -286,6 +286,7 @@ class CPModuleTest(ModuleCase):
|
|||
self.assertNotIn('bacon', data)
|
||||
|
||||
@skipIf(not SSL3_SUPPORT, 'Requires python with SSL3 support')
|
||||
@skipIf(salt.utils.platform.is_darwin(), 'minion is OS X, skipping for now')
|
||||
@with_tempfile()
|
||||
def test_get_url_https(self, tgt):
|
||||
'''
|
||||
|
@ -397,6 +398,7 @@ class CPModuleTest(ModuleCase):
|
|||
self.assertEqual(ret, False)
|
||||
|
||||
@skipIf(not SSL3_SUPPORT, 'Requires python with SSL3 support')
|
||||
@skipIf(salt.utils.platform.is_darwin() and six.PY2, 'This test hangs on OS X on Py2')
|
||||
def test_get_file_str_https(self):
|
||||
'''
|
||||
cp.get_file_str with https:// source given
|
||||
|
|
Loading…
Add table
Reference in a new issue