Merged revisions 88671 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r88671 | antoine.pitrou | 2011-02-27 16:44:12 +0100 (dim., 27 févr. 2011) | 3 lines

  Follow up to r88664: non-blocking connect-ex() can return EWOULDBLOCK under Windows
........
This commit is contained in:
Antoine Pitrou 2011-02-27 15:45:22 +00:00
parent 17e25d8c65
commit 8ef3907044
1 changed files with 2 additions and 1 deletions

View File

@ -248,7 +248,8 @@ class NetworkedTests(unittest.TestCase):
try:
s.setblocking(False)
rc = s.connect_ex(('svn.python.org', 443))
self.assertIn(rc, (0, errno.EINPROGRESS))
# EWOULDBLOCK under Windows, EINPROGRESS elsewhere
self.assertIn(rc, (0, errno.EINPROGRESS, errno.EWOULDBLOCK))
# Wait for connect to finish
select.select([], [s], [], 5.0)
# Non-blocking handshake