mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-25 01:43:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 14

merge 3.3 (#20896)

Browse source
This commit is contained in:
Benjamin Peterson 2014-03-12 18:10:57 -05:00
commit 8546e226bd
1 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Lib/test/test_ssl.py
View file

@ -1351,12 +1351,15 @@ class NetworkedTests(unittest.TestCase):
def test_get_server_certificate(self): def test_get_server_certificate(self):
def _test_get_server_certificate(host, port, cert=None): def _test_get_server_certificate(host, port, cert=None):
with support.transient_internet(host): 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: if not pem:
self.fail("No server certificate on %s:%s!" % (host, port)) self.fail("No server certificate on %s:%s!" % (host, port))
try: 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: except ssl.SSLError as x:
#should fail #should fail
if support.verbose: if support.verbose:
@ -1364,7 +1367,9 @@ class NetworkedTests(unittest.TestCase):
else: else:
self.fail("Got server certificate %s for %s:%s!" % (pem, host, port)) 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: if not pem:
self.fail("No server certificate on %s:%s!" % (host, port)) self.fail("No server certificate on %s:%s!" % (host, port))
if support.verbose: if support.verbose: