summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Panter <vadmium+py@gmail.com>2016-01-15 02:28:59 (GMT)
committerMartin Panter <vadmium+py@gmail.com>2016-01-15 02:28:59 (GMT)
commita8b43b5fc35aa3dd96c31cf35cdcc66036c37a6f (patch)
tree11004b9bdf4eff4e37206110c0828556fce2026e
parent40b97ec57a32adc25b0c44285ee924ccabb11a89 (diff)
parent3f2240ccb6841576fe2366c71fb8b3b1569906f5 (diff)
downloadcpython-a8b43b5fc35aa3dd96c31cf35cdcc66036c37a6f.zip
cpython-a8b43b5fc35aa3dd96c31cf35cdcc66036c37a6f.tar.gz
cpython-a8b43b5fc35aa3dd96c31cf35cdcc66036c37a6f.tar.bz2
Issue #25940: Merge ETIMEDOUT fix from 3.4 into 3.5
-rw-r--r--Lib/test/test_ssl.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
index f95cfba..a480b72 100644
--- a/Lib/test/test_ssl.py
+++ b/Lib/test/test_ssl.py
@@ -1440,7 +1440,7 @@ class NetworkedTests(unittest.TestCase):
# Issue #19919: Windows machines or VMs hosted on Windows
# machines sometimes return EWOULDBLOCK.
errors = (
- errno.ECONNREFUSED, errno.EHOSTUNREACH,
+ errno.ECONNREFUSED, errno.EHOSTUNREACH, errno.ETIMEDOUT,
errno.EWOULDBLOCK,
)
self.assertIn(rc, errors)