Commit 50778ab4 authored by Antoine Pitrou's avatar Antoine Pitrou

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().
........
parent 6d6fa47f
This diff is collapsed.
...@@ -623,6 +623,7 @@ def transient_internet(resource_name, *, timeout=30.0, errnos=()): ...@@ -623,6 +623,7 @@ def transient_internet(resource_name, *, timeout=30.0, errnos=()):
default_errnos = [ default_errnos = [
('ECONNREFUSED', 111), ('ECONNREFUSED', 111),
('ECONNRESET', 104), ('ECONNRESET', 104),
('EHOSTUNREACH', 113),
('ENETUNREACH', 101), ('ENETUNREACH', 101),
('ETIMEDOUT', 110), ('ETIMEDOUT', 110),
] ]
......
...@@ -228,7 +228,7 @@ class NetworkedTests(unittest.TestCase): ...@@ -228,7 +228,7 @@ class NetworkedTests(unittest.TestCase):
# NOTE: https://sha256.tbs-internet.com is another possible test host # NOTE: https://sha256.tbs-internet.com is another possible test host
remote = ("sha2.hboeck.de", 443) remote = ("sha2.hboeck.de", 443)
sha256_cert = os.path.join(os.path.dirname(__file__), "sha256.pem") sha256_cert = os.path.join(os.path.dirname(__file__), "sha256.pem")
with support.transient_internet("sha2.hboeck.de"): with support.transient_internet("sha256.tbs-internet.com"):
s = ssl.wrap_socket(socket.socket(socket.AF_INET), s = ssl.wrap_socket(socket.socket(socket.AF_INET),
cert_reqs=ssl.CERT_REQUIRED, cert_reqs=ssl.CERT_REQUIRED,
ca_certs=sha256_cert,) ca_certs=sha256_cert,)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment