Fix up test coverage

Ian Cordasco · Ian Cordasco · commit 248f038a46f1 · 2014-10-23T16:41:36.000-05:00
diff --git a/test/test_util.py b/test/test_util.py
@@ -4,7 +4,7 @@
 import ssl
 from itertools import chain
 
-from mock import patch
+from mock import patch, Mock
 
 from urllib3 import add_stderr_logger, disable_warnings
 from urllib3.util.request import make_headers
@@ -15,7 +15,7 @@
     split_first,
     Url,
 )
-from urllib3.util.ssl_ import resolve_cert_reqs
+from urllib3.util.ssl_ import resolve_cert_reqs, ssl_wrap_socket
 from urllib3.exceptions import (
     LocationParseError,
     TimeoutStateError,
@@ -372,3 +372,20 @@ class NotReallyAFile(object):
             pass
 
         self.assertRaises(ValueError, is_fp_closed, NotReallyAFile())
+
+    def test_ssl_wrap_socket_loads_the_cert_chain(self):
+        socket = object()
+        mock_context = Mock()
+        ssl_wrap_socket(ssl_context=mock_context, sock=socket,
+                        certfile='/path/to/certfile')
+
+        mock_context.load_cert_chain.assert_called_once_with(
+            '/path/to/certfile', None)
+
+    def test_ssl_wrap_socket_loads_verify_locations(self):
+        socket = object()
+        mock_context = Mock()
+        ssl_wrap_socket(ssl_context=mock_context, ca_certs='/path/to/pem',
+                        sock=socket)
+        mock_context.load_verify_locations.assert_called_once_with(
+            '/path/to/pem')
diff --git a/urllib3/util/ssl_.py b/urllib3/util/ssl_.py
@@ -176,7 +176,7 @@ def create_urllib3_context(ssl_version=None, cert_reqs=ssl.CERT_REQUIRED,
     """
     try:
         context = SSLContext(ssl_version or ssl.PROTOCOL_SSLv23)
-    except (NameError, TypeError):
+    except (NameError, TypeError):  # Platform-specific: Python 3.1, 2.7 or 2.6
         context = FakeSSLContext(ssl_version or ssl.PROTOCOL_SSLv23)
     if options is None:
         options = 0
