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
........

diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
index 20cfe38e360b6262d461a3b56cad24e0fc4f08d0..25672184156fbf1dddcb9f61a548992bde31b082 100644 (file)
--- a/Lib/test/test_ssl.py
+++ b/Lib/test/test_ssl.py
@@ -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