diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2011-02-27 15:45:22 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2011-02-27 15:45:22 (GMT) |
| commit | 8ef390704456d41967e9fa984995a81f53c062fd (patch) | |
| tree | b04df4e6ba9980e76285f79c4289313c71decb88 /Lib/test/test_ssl.py | |
| parent | 17e25d8c653edd3d8bef6da094af14001b534c70 (diff) | |
| download | cpython-8ef390704456d41967e9fa984995a81f53c062fd.zip cpython-8ef390704456d41967e9fa984995a81f53c062fd.tar.gz cpython-8ef390704456d41967e9fa984995a81f53c062fd.tar.bz2 | |
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
........
Diffstat (limited to 'Lib/test/test_ssl.py')
| -rw-r--r-- | Lib/test/test_ssl.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py index 20cfe38..2567218 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 |