| commit | a8b43b5fc35aa3dd96c31cf35cdcc66036c37a6f | [log] [tgz] |
|---|---|---|
| author | Martin Panter <vadmium+py@gmail.com> | Fri Jan 15 02:28:59 2016 +0000 |
| committer | Martin Panter <vadmium+py@gmail.com> | Fri Jan 15 02:28:59 2016 +0000 |
| tree | 11004b9bdf4eff4e37206110c0828556fce2026e | |
| parent | 40b97ec57a32adc25b0c44285ee924ccabb11a89 [diff] | |
| parent | 3f2240ccb6841576fe2366c71fb8b3b1569906f5 [diff] |
Issue #25940: Merge ETIMEDOUT fix from 3.4 into 3.5
diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py index f95cfba..a480b72 100644 --- a/Lib/test/test_ssl.py +++ b/Lib/test/test_ssl.py
@@ -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)