From: Martin Panter <vadmium+py@gmail.com>
Date: Fri, 15 Jan 2016 02:08:13 +0000 (+0000)
Subject: Issue #25940: Merge ETIMEDOUT fix from 3.2 into 3.3
X-Git-Tag: v3.4.5rc1~23^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fab75d9bb90470f00ca02acc08f583de6c09f983;p=thirdparty%2FPython%2Fcpython.git

Issue #25940: Merge ETIMEDOUT fix from 3.2 into 3.3
---

fab75d9bb90470f00ca02acc08f583de6c09f983
diff --cc Lib/test/test_ssl.py
index 03d40b22551c,f587945afdfb..6ff2c7f75ec9
--- a/Lib/test/test_ssl.py
+++ b/Lib/test/test_ssl.py
@@@ -853,12 -608,8 +853,12 @@@ class NetworkedTests(unittest.TestCase)
                                  ca_certs=REMOTE_ROOT_CERT)
              try:
                  rc = s.connect_ex((REMOTE_HOST, 444))
 +                # 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.ECONNREFUSED, errno.EHOSTUNREACH, errno.ETIMEDOUT,
 +                    errno.EWOULDBLOCK,
 +                )
                  self.assertIn(rc, errors)
              finally:
                  s.close()