changeset:   89793:9b91c23f071c
branch:      3.4
user:        Benjamin Peterson <benjamin@python.org>
date:        Wed Mar 12 18:10:57 2014 -0500
files:       Lib/test/test_ssl.py
description:
merge 3.3 (#20896)


diff -r f7d093a4ebf6 -r 9b91c23f071c Lib/test/test_ssl.py
--- a/Lib/test/test_ssl.py	Fri Mar 07 21:00:34 2014 -0500
+++ b/Lib/test/test_ssl.py	Wed Mar 12 18:10:57 2014 -0500
@@ -1351,12 +1351,15 @@
     def test_get_server_certificate(self):
         def _test_get_server_certificate(host, port, cert=None):
             with support.transient_internet(host):
-                pem = ssl.get_server_certificate((host, port))
+                pem = ssl.get_server_certificate((host, port),
+                                                 ssl.PROTOCOL_SSLv23)
                 if not pem:
                     self.fail("No server certificate on %s:%s!" % (host, port))
 
                 try:
-                    pem = ssl.get_server_certificate((host, port), ca_certs=CERTFILE)
+                    pem = ssl.get_server_certificate((host, port),
+                                                     ssl.PROTOCOL_SSLv23,
+                                                     ca_certs=CERTFILE)
                 except ssl.SSLError as x:
                     #should fail
                     if support.verbose:
@@ -1364,7 +1367,9 @@
                 else:
                     self.fail("Got server certificate %s for %s:%s!" % (pem, host, port))
 
-                pem = ssl.get_server_certificate((host, port), ca_certs=cert)
+                pem = ssl.get_server_certificate((host, port),
+                                                 ssl.PROTOCOL_SSLv23,
+                                                 ca_certs=cert)
                 if not pem:
                     self.fail("No server certificate on %s:%s!" % (host, port))
                 if support.verbose: