[Python-checkins] cpython (2.7): separate cert loading tests into Windows and non-Windows cases
benjamin.peterson
python-checkins at python.org
Sat Oct 4 00:17:36 CEST 2014
https://hg.python.org/cpython/rev/fb9255d0b0f9
changeset: 92779:fb9255d0b0f9
branch: 2.7
parent: 92776:d9c52836aec8
user: Benjamin Peterson <benjamin at python.org>
date: Fri Oct 03 18:17:15 2014 -0400
summary:
separate cert loading tests into Windows and non-Windows cases
files:
Lib/test/test_ssl.py | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
--- a/Lib/test/test_ssl.py
+++ b/Lib/test/test_ssl.py
@@ -1058,6 +1058,7 @@
self.assertRaises(TypeError, ctx.load_default_certs, None)
self.assertRaises(TypeError, ctx.load_default_certs, 'SERVER_AUTH')
+ @unittest.skipIf(sys.platform == "win32", "not-Windows specific")
def test_load_default_certs_env(self):
ctx = ssl.SSLContext(ssl.PROTOCOL_TLSv1)
with support.EnvironmentVarGuard() as env:
@@ -1066,6 +1067,20 @@
ctx.load_default_certs()
self.assertEqual(ctx.cert_store_stats(), {"crl": 0, "x509": 1, "x509_ca": 0})
+ @unittest.skipUnless(sys.platform == "win32", "Windows specific")
+ def test_load_default_certs_env_windows(self):
+ ctx = ssl.SSLContext(ssl.PROTOCOL_TLSv1)
+ ctx.load_default_certs()
+ stats = ctx.cert_store_stats()
+
+ ctx = ssl.SSLContext(ssl.PROTOCOL_TLSv1)
+ with support.EnvironmentVarGuard() as env:
+ env["SSL_CERT_DIR"] = CAPATH
+ env["SSL_CERT_FILE"] = CERTFILE
+ ctx.load_default_certs()
+ stats["x509"] += 1
+ self.assertEqual(ctx.cert_store_stats(), stats)
+
def test_create_default_context(self):
ctx = ssl.create_default_context()
self.assertEqual(ctx.protocol, ssl.PROTOCOL_SSLv23)
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list