changeset:   89611:12df02358137
branch:      3.3
parent:      89605:e682f87a6822
parent:      89609:789ca594960f
user:        Benjamin Peterson <benjamin@python.org>
date:        Wed Mar 12 18:10:47 2014 -0500
files:       Lib/test/test_ssl.py
description:
merge 3.2 (#20896)


diff -r e682f87a6822 -r 12df02358137 Lib/test/test_ssl.py
--- a/Lib/test/test_ssl.py	Wed Mar 12 15:08:43 2014 -0500
+++ b/Lib/test/test_ssl.py	Wed Mar 12 18:10:47 2014 -0500
@@ -964,12 +964,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:
@@ -977,7 +980,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: