From 8ef390704456d41967e9fa984995a81f53c062fd Mon Sep 17 00:00:00 2001 From: Antoine Pitrou Date: Sun, 27 Feb 2011 15:45:22 +0000 Subject: [PATCH] Merged revisions 88671 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ........ 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 ........ --- Lib/test/test_ssl.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py index 20cfe38e360..25672184156 100644 --- 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