diff options
| author | Benjamin Peterson <benjamin@python.org> | 2014-11-04 02:06:07 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2014-11-04 02:06:07 (GMT) |
| commit | 98e1b9158ce950e7448ab3860bc556002b8a8e4a (patch) | |
| tree | 2da9bcfbee66e88f6259db7120c15f0b7f3ccd97 | |
| parent | 4a358de34e5963b68bef1a398f0e0686331912e7 (diff) | |
| parent | 1ea070e56185889f2e0360a3d0c03e35af744bf6 (diff) | |
| download | cpython-98e1b9158ce950e7448ab3860bc556002b8a8e4a.zip cpython-98e1b9158ce950e7448ab3860bc556002b8a8e4a.tar.gz cpython-98e1b9158ce950e7448ab3860bc556002b8a8e4a.tar.bz2 | |
merge 3.4
| -rw-r--r-- | Lib/test/test_ssl.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py index 4f46571..aa17317 100644 --- 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: |