Issue #25940: Merge ETIMEDOUT fix from 3.4 into 3.5

vadmium · vadmium · commit a8b43b5fc35a · 2016-01-15T02:28:59.000Z
diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
@@ -1440,7 +1440,7 @@ def test_connect_ex_error(self):
                 # 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)

Original file line number	Diff line number	Diff line change
`@@ -1440,7 +1440,7 @@ def test_connect_ex_error(self):`
`1440`	`1440`	`# Issue #19919: Windows machines or VMs hosted on Windows`
`1441`	`1441`	`# machines sometimes return EWOULDBLOCK.`
`1442`	`1442`	`errors = (`
`1443`		`- errno.ECONNREFUSED, errno.EHOSTUNREACH,`
	`1443`	`+ errno.ECONNREFUSED, errno.EHOSTUNREACH, errno.ETIMEDOUT,`
`1444`	`1444`	`errno.EWOULDBLOCK,`
`1445`	`1445`	`)`
`1446`	`1446`	`self.assertIn(rc, errors)`