diff options
| author | Daniele Tricoli <eriol@mornie.org> | 2015-10-09 23:19:30 +0200 |
|---|---|---|
| committer | Daniele Tricoli <eriol@mornie.org> | 2015-10-09 23:19:30 +0200 |
| commit | cd2a4010a9e1356c36cfb42b57501343c29e2608 (patch) | |
| tree | 81af3946a53bb27e34e85eb28035ace8c3e7b27e /test/test_util.py | |
| parent | ebc01af6ebb87c1e27e50b4ea572b8c1a20e70b0 (diff) | |
| parent | 7db0aa9b18e70f43ef0bfcdec7f223e5b681aaf0 (diff) | |
| download | python-urllib3-cd2a4010a9e1356c36cfb42b57501343c29e2608.tar python-urllib3-cd2a4010a9e1356c36cfb42b57501343c29e2608.tar.gz | |
merge patched into master
Diffstat (limited to 'test/test_util.py')
| -rw-r--r-- | test/test_util.py | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/test/test_util.py b/test/test_util.py index 19ba57e..fa59ada 100644 --- a/test/test_util.py +++ b/test/test_util.py @@ -393,7 +393,15 @@ class TestUtil(unittest.TestCase): 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') + '/path/to/pem', None) + + def test_ssl_wrap_socket_loads_certificate_directories(self): + socket = object() + mock_context = Mock() + ssl_wrap_socket(ssl_context=mock_context, ca_cert_dir='/path/to/pems', + sock=socket) + mock_context.load_verify_locations.assert_called_once_with( + None, '/path/to/pems') def test_ssl_wrap_socket_with_no_sni(self): socket = object() |