[Python-checkins] cpython (merge 3.3 -> 3.4): Issue #25940: Merge ETIMEDOUT fix from 3.3 into 3.4
martin.panter
python-checkins at python.org
Thu Jan 14 21:46:47 EST 2016
https://hg.python.org/cpython/rev/a806ed21bd82
changeset: 99899:a806ed21bd82
branch: 3.4
parent: 99891:0585c0089466
parent: 99898:c5cae7366835
user: Martin Panter <vadmium+py at gmail.com>
date: Fri Jan 15 02:18:31 2016 +0000
summary:
Issue #25940: Merge ETIMEDOUT fix from 3.3 into 3.4
files:
Lib/test/test_ssl.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
--- a/Lib/test/test_ssl.py
+++ b/Lib/test/test_ssl.py
@@ -1267,7 +1267,7 @@
# 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)
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list