(original) (raw)

changeset: 99900:bd9d5bc8bc95 branch: 3.5 parent: 99893:f5f14d65297e parent: 99899:a806ed21bd82 user: Martin Panter vadmium+py@gmail.com date: Fri Jan 15 02:28:59 2016 +0000 files: Lib/test/test_ssl.py description: Issue #25940: Merge ETIMEDOUT fix from 3.4 into 3.5 diff -r f5f14d65297e -r bd9d5bc8bc95 Lib/test/test_ssl.py --- a/Lib/test/test_ssl.py Thu Jan 14 13:05:46 2016 +0000 +++ b/Lib/test/test_ssl.py Fri Jan 15 02:28:59 2016 +0000 @@ -1440,7 +1440,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) /vadmium+py@gmail.com