merge 3.4

98e1b915 · Benjamin Peterson · 4a358de3 · 1ea070e5 · 98e1b915
Commit 98e1b915 authored Nov 03, 2014 by Benjamin Peterson
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

Lib/test/test_ssl.py Lib/test/test_ssl.py +1 -1

No files found.
--- a/Lib/test/test_ssl.py
+++ b/Lib/test/test_ssl.py
@@ -811,7 +811,7 @@ class ContextTests(unittest.TestCase):
    def test_load_cert_chain(self):
        ctx = ssl.SSLContext(ssl.PROTOCOL_TLSv1)
        # Combined key and cert in a single file
-        ctx.load_cert_chain(CERTFILE)
+        ctx.load_cert_chain(CERTFILE, keyfile=None)
        ctx.load_cert_chain(CERTFILE, keyfile=CERTFILE)
        self.assertRaises(TypeError, ctx.load_cert_chain, keyfile=CERTFILE)
        with self.assertRaises(OSError) as cm: