traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Issue #20896: Workaround the bug temporarely to fix buildbots

This commit is contained in:
Victor Stinner 2014-03-12 12:41:44 +01:00
parent a0fe1f74f9
commit 5a2c04012c
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Lib/test/test_ssl.py
View File

@ -1351,12 +1351,13 @@ class NetworkedTests(unittest.TestCase):
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))
# FIXME: force PROTOCOL_SSLv23 for workaround bug #20896
pem = ssl.get_server_certificate((host, port), ssl_version=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), ca_certs=CERTFILE, ssl_version=ssl.PROTOCOL_SSLv23)
except ssl.SSLError as x:
#should fail
if support.verbose:
@ -1364,7 +1365,7 @@ class NetworkedTests(unittest.TestCase):
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), ca_certs=cert, ssl_version=ssl.PROTOCOL_SSLv23)
if not pem:
self.fail("No server certificate on %s:%s!" % (host, port))
if support.verbose: