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 #42857 from gtmanfred/vmware

Browse source 
use older name if _create_unverified_context is unvailable
This commit is contained in:
Nicole Thomas 2017-08-11 09:37:58 -04:00 • committed by GitHub
commit 3d05d89e09
1 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
tests/unit/utils/vmware_test/test_connection.py
View file

@ -40,6 +40,11 @@ if sys.version_info[:3] > (2, 7, 8):
else:
SSL_VALIDATION = False
if hasattr(ssl, '_create_unverified_context'):
ssl_context = 'ssl._create_unverified_context'
else:
ssl_context = 'ssl._create_stdlib_context'
# Get Logging Started
log = logging.getLogger(__name__)
@ -337,14 +342,14 @@ class PrivateGetServiceInstanceTestCase(TestCase):
@skipIf(not SSL_VALIDATION, 'SSL validation is not enabled')
def test_second_attempt_successful_connection(self):
with patch('ssl.SSLContext', MagicMock()), \
patch('ssl._create_unverified_context', MagicMock()):
patch(ssl_context, MagicMock()):
exc = vim.fault.HostConnectFault()
exc.msg = '[SSL: CERTIFICATE_VERIFY_FAILED]'
mock_sc = MagicMock(side_effect=[exc, None])
mock_ssl = MagicMock()
with patch('salt.utils.vmware.SmartConnect', mock_sc):
with patch('ssl._create_unverified_context',
with patch(ssl_context,
mock_ssl):
salt.utils.vmware._get_service_instance(
@ -378,7 +383,7 @@ class PrivateGetServiceInstanceTestCase(TestCase):
@skipIf(not SSL_VALIDATION, 'SSL validation is not enabled')
def test_third_attempt_successful_connection(self):
with patch('ssl.SSLContext', MagicMock()), \
patch('ssl._create_unverified_context', MagicMock()):
patch(ssl_context, MagicMock()):
exc = vim.fault.HostConnectFault()
exc.msg = '[SSL: CERTIFICATE_VERIFY_FAILED]'
exc2 = Exception('certificate verify failed')
@ -387,9 +392,7 @@ class PrivateGetServiceInstanceTestCase(TestCase):
mock_ssl_context = MagicMock()
with patch('salt.utils.vmware.SmartConnect', mock_sc):
with patch('ssl._create_unverified_context',
mock_ssl_unverif):
with patch(ssl_context, mock_ssl_unverif):
with patch('ssl.SSLContext', mock_ssl_context):
salt.utils.vmware._get_service_instance(
@ -473,7 +476,7 @@ class PrivateGetServiceInstanceTestCase(TestCase):
@skipIf(not SSL_VALIDATION, 'SSL validation is not enabled')
def test_second_attempt_unsuccsessful_connection_default_error(self):
with patch('ssl.SSLContext', MagicMock()), \
patch('ssl._create_unverified_context', MagicMock()):
patch(ssl_context, MagicMock()):
exc = vim.fault.HostConnectFault()
exc.msg = '[SSL: CERTIFICATE_VERIFY_FAILED]'
exc2 = Exception('Exception')
@ -498,7 +501,7 @@ class PrivateGetServiceInstanceTestCase(TestCase):
@skipIf(not SSL_VALIDATION, 'SSL validation is not enabled')
def test_second_attempt_unsuccsessful_connection_vim_fault(self):
with patch('ssl.SSLContext', MagicMock()), \
patch('ssl._create_unverified_context', MagicMock()):
patch(ssl_context, MagicMock()):
exc = vim.fault.HostConnectFault()
exc.msg = '[SSL: CERTIFICATE_VERIFY_FAILED]'
exc2 = vim.fault.VimFault()
@ -523,7 +526,7 @@ class PrivateGetServiceInstanceTestCase(TestCase):
@skipIf(not SSL_VALIDATION, 'SSL validation is not enabled')
def test_third_attempt_unsuccessful_connection_detault_error(self):
with patch('ssl.SSLContext', MagicMock()), \
patch('ssl._create_unverified_context', MagicMock()):
patch(ssl_context, MagicMock()):
exc = vim.fault.HostConnectFault()
exc.msg = '[SSL: CERTIFICATE_VERIFY_FAILED]'
exc2 = Exception('certificate verify failed')
@ -548,7 +551,7 @@ class PrivateGetServiceInstanceTestCase(TestCase):
@skipIf(not SSL_VALIDATION, 'SSL validation is not enabled')
def test_third_attempt_unsuccessful_connection_vim_fault(self):
with patch('ssl.SSLContext', MagicMock()), \
patch('ssl._create_unverified_context', MagicMock()):
patch(ssl_context, MagicMock()):
exc = vim.fault.HostConnectFault()
exc.msg = '[SSL: CERTIFICATE_VERIFY_FAILED]'
exc2 = Exception('certificate verify failed')