(original) (raw)

changeset: 99899:a806ed21bd82 branch: 3.4 parent: 99891:0585c0089466 parent: 99898:c5cae7366835 user: Martin Panter vadmium+py@gmail.com date: Fri Jan 15 02🔞31 2016 +0000 files: Lib/test/test_ssl.py description: Issue #25940: Merge ETIMEDOUT fix from 3.3 into 3.4 diff -r 0585c0089466 -r a806ed21bd82 Lib/test/test_ssl.py --- a/Lib/test/test_ssl.py Thu Jan 14 12:53:56 2016 +0000 +++ b/Lib/test/test_ssl.py Fri Jan 15 02🔞31 2016 +0000 @@ -1267,7 +1267,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