(original) (raw)

changeset: 99898:c5cae7366835 branch: 3.3 parent: 99889:e167a9296947 parent: 99897:b2036b717028 user: Martin Panter vadmium+py@gmail.com date: Fri Jan 15 02:08:13 2016 +0000 files: Lib/test/test_ssl.py description: Issue #25940: Merge ETIMEDOUT fix from 3.2 into 3.3 diff -r e167a9296947 -r c5cae7366835 Lib/test/test_ssl.py --- a/Lib/test/test_ssl.py Thu Jan 14 12:21:02 2016 +0000 +++ b/Lib/test/test_ssl.py Fri Jan 15 02:08:13 2016 +0000 @@ -856,7 +856,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