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

vadmium · vadmium · commit fab75d9bb904 · 2016-01-15T02:08:13.000Z
diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
@@ -856,7 +856,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
`@@ -856,7 +856,7 @@ def test_connect_ex_error(self):`
`856`	`856`	`# Issue #19919: Windows machines or VMs hosted on Windows`
`857`	`857`	`# machines sometimes return EWOULDBLOCK.`
`858`	`858`	`errors = (`
`859`		`- errno.ECONNREFUSED, errno.EHOSTUNREACH,`
	`859`	`+ errno.ECONNREFUSED, errno.EHOSTUNREACH, errno.ETIMEDOUT,`
`860`	`860`	`errno.EWOULDBLOCK,`
`861`	`861`	`)`
`862`	`862`	`self.assertIn(rc, errors)`