diff options
| author | Martin Panter <vadmium+py@gmail.com> | 2016-01-15 02:18:31 (GMT) |
|---|---|---|
| committer | Martin Panter <vadmium+py@gmail.com> | 2016-01-15 02:18:31 (GMT) |
| commit | 3f2240ccb6841576fe2366c71fb8b3b1569906f5 (patch) | |
| tree | 10945cbfa6137235a22e8abb402c84e980835535 /Lib | |
| parent | b55f8b79af5db5459aeff14b6176e54f6db60317 (diff) | |
| parent | fab75d9bb90470f00ca02acc08f583de6c09f983 (diff) | |
| download | cpython-3f2240ccb6841576fe2366c71fb8b3b1569906f5.zip cpython-3f2240ccb6841576fe2366c71fb8b3b1569906f5.tar.gz cpython-3f2240ccb6841576fe2366c71fb8b3b1569906f5.tar.bz2 | |
Issue #25940: Merge ETIMEDOUT fix from 3.3 into 3.4
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/test/test_ssl.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py index 7b064ca..c1939b5 100644 --- a/Lib/test/test_ssl.py +++ b/Lib/test/test_ssl.py @@ -1267,7 +1267,7 @@ class NetworkedTests(unittest.TestCase): # 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) |