changeset:   93846:fb1ffd40d33e
user:        Victor Stinner <victor.stinner@gmail.com>
date:        Fri Dec 12 12:23:59 2014 +0100
files:       Lib/test/test_ssl.py
description:
Issue #22935: Fix test_ssl when the SSLv3 protocol is not supported


diff -r 1bbdb0573cd4 -r fb1ffd40d33e Lib/test/test_ssl.py
--- a/Lib/test/test_ssl.py	Fri Dec 12 12:23:29 2014 +0100
+++ b/Lib/test/test_ssl.py	Fri Dec 12 12:23:59 2014 +0100
@@ -143,8 +143,8 @@
     def test_str_for_enums(self):
         # Make sure that the PROTOCOL_* constants have enum-like string
         # reprs.
-        proto = ssl.PROTOCOL_SSLv3
-        self.assertEqual(str(proto), '_SSLMethod.PROTOCOL_SSLv3')
+        proto = ssl.PROTOCOL_SSLv23
+        self.assertEqual(str(proto), '_SSLMethod.PROTOCOL_SSLv23')
         ctx = ssl.SSLContext(proto)
         self.assertIs(ctx.protocol, proto)
 
@@ -2384,7 +2384,8 @@
             try_protocol_combo(ssl.PROTOCOL_SSLv2, ssl.PROTOCOL_SSLv2, True, ssl.CERT_OPTIONAL)
             try_protocol_combo(ssl.PROTOCOL_SSLv2, ssl.PROTOCOL_SSLv2, True, ssl.CERT_REQUIRED)
             try_protocol_combo(ssl.PROTOCOL_SSLv2, ssl.PROTOCOL_SSLv23, False)
-            try_protocol_combo(ssl.PROTOCOL_SSLv2, ssl.PROTOCOL_SSLv3, False)
+            if hasattr(ssl, 'PROTOCOL_SSLv3'):
+                try_protocol_combo(ssl.PROTOCOL_SSLv2, ssl.PROTOCOL_SSLv3, False)
             try_protocol_combo(ssl.PROTOCOL_SSLv2, ssl.PROTOCOL_TLSv1, False)
             # SSLv23 client with specific SSL options
             if no_sslv2_implies_sslv3_hello():