diff options
author | Antoine Pitrou <solipsis@pitrou.net> | 2011-01-08 10:32:51 (GMT) |
---|---|---|
committer | Antoine Pitrou <solipsis@pitrou.net> | 2011-01-08 10:32:51 (GMT) |
commit | d43245a965dc83db34063b22071fde143b81a490 (patch) | |
tree | 32c5b2dbfd1d38afaf0c8783d46a43fadb160a29 /Lib/test/test_ssl.py | |
parent | f653ddbef247b12120a6a1b286824816da6f24b1 (diff) | |
download | cpython-d43245a965dc83db34063b22071fde143b81a490.zip cpython-d43245a965dc83db34063b22071fde143b81a490.tar.gz cpython-d43245a965dc83db34063b22071fde143b81a490.tar.bz2 |
Merged revisions 87861,87863 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r87861 | antoine.pitrou | 2011-01-08 11:23:29 +0100 (sam., 08 janv. 2011) | 3 lines
Fix test_ssl after r87849
........
r87863 | antoine.pitrou | 2011-01-08 11:28:11 +0100 (sam., 08 janv. 2011) | 3 lines
Add EHOSTUNREACH ('No route to host') to the errnos trapped by transient_internet().
........
Diffstat (limited to 'Lib/test/test_ssl.py')
-rw-r--r-- | Lib/test/test_ssl.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py index 4c12ce4..bc2bfcc 100644 --- a/Lib/test/test_ssl.py +++ b/Lib/test/test_ssl.py @@ -297,9 +297,9 @@ class NetworkedTests(unittest.TestCase): if ssl.OPENSSL_VERSION_INFO < (0, 9, 8, 0, 15): self.skipTest("SHA256 not available on %r" % ssl.OPENSSL_VERSION) # NOTE: https://sha256.tbs-internet.com is another possible test host - remote = ("sha2.hboeck.de", 443) + remote = ("sha256.tbs-internet.com", 443) sha256_cert = os.path.join(os.path.dirname(__file__), "sha256.pem") - with test_support.transient_internet("sha2.hboeck.de"): + with test_support.transient_internet("sha256.tbs-internet.com"): s = ssl.wrap_socket(socket.socket(socket.AF_INET), cert_reqs=ssl.CERT_REQUIRED, ca_certs=sha256_cert,) |