]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Issue #25940: Merge ETIMEDOUT fix from 3.2 into 3.3
authorMartin Panter <vadmium+py@gmail.com>
Fri, 15 Jan 2016 02:08:13 +0000 (02:08 +0000)
committerMartin Panter <vadmium+py@gmail.com>
Fri, 15 Jan 2016 02:08:13 +0000 (02:08 +0000)
1  2 
Lib/test/test_ssl.py

index 03d40b22551cec054d1706b861e67894f7299661,f587945afdfb63b45f2bc8c9690a431e16518b0c..6ff2c7f75ec96fd0d8d0a5da974672829512af7e
@@@ -853,12 -608,8 +853,12 @@@ class NetworkedTests(unittest.TestCase)
                                  ca_certs=REMOTE_ROOT_CERT)
              try:
                  rc = s.connect_ex((REMOTE_HOST, 444))
 +                # 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.ECONNREFUSED, errno.EHOSTUNREACH, errno.ETIMEDOUT,
 +                    errno.EWOULDBLOCK,
 +                )
                  self.assertIn(rc, errors)
              finally:
                  s.close()