[Python-checkins] r88673 - in python/branches/release27-maint: Lib/test/test_ssl.py

[antoine.pitrou]

Author: antoine.pitrou
Date: Sun Feb 27 16:45:22 2011
New Revision: 88673

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


Modified:
   python/branches/release27-maint/   (props changed)
   python/branches/release27-maint/Lib/test/test_ssl.py

Modified: python/branches/release27-maint/Lib/test/test_ssl.py
==============================================================================
--- python/branches/release27-maint/Lib/test/test_ssl.py	(original)
+++ python/branches/release27-maint/Lib/test/test_ssl.py	Sun Feb 27 16:45:22 2011
@@ -248,7 +248,8 @@
             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