[Python-checkins] cpython (merge 3.2 -> 3.3): Issue #25940: Merge ETIMEDOUT fix from 3.2 into 3.3

[martin.panter]

https://hg.python.org/cpython/rev/c5cae7366835
changeset:   99898:c5cae7366835
branch:      3.3
parent:      99889:e167a9296947
parent:      99897:b2036b717028
user:        Martin Panter <vadmium+py at gmail.com>
date:        Fri Jan 15 02:08:13 2016 +0000
summary:
  Issue #25940: Merge ETIMEDOUT fix from 3.2 into 3.3

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
@@ -856,7 +856,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