diff options
| author | Martin Panter <vadmium+py@gmail.com> | 2016-01-15 02:08:13 (GMT) |
|---|---|---|
| committer | Martin Panter <vadmium+py@gmail.com> | 2016-01-15 02:08:13 (GMT) |
| commit | fab75d9bb90470f00ca02acc08f583de6c09f983 (patch) | |
| tree | 2eb344c129b8ffd3581a476ae6b1654460f386f7 /Lib | |
| parent | 73f55076f667c7678e422e7c85613ee6737a11bf (diff) | |
| parent | 035583b389c614b06faf811b062c7ecbf74fce20 (diff) | |
| download | cpython-fab75d9bb90470f00ca02acc08f583de6c09f983.zip cpython-fab75d9bb90470f00ca02acc08f583de6c09f983.tar.gz cpython-fab75d9bb90470f00ca02acc08f583de6c09f983.tar.bz2 | |
Issue #25940: Merge ETIMEDOUT fix from 3.2 into 3.3
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 03d40b2..6ff2c7f 100644 --- a/Lib/test/test_ssl.py +++ b/Lib/test/test_ssl.py @@ -856,7 +856,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) |