summaryrefslogtreecommitdiffstats
path: root/Lib/test/test_ssl.py
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2011-02-27 15:44:12 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2011-02-27 15:44:12 (GMT)
commit8a14a0c88bf5b72da899c9ce9863e14dcd48b9c7 (patch)
treedd170479d1ab3f6d425d2909d3a55a0fef9409ed /Lib/test/test_ssl.py
parentd0f89f3247277a8880adc5b3a4cec210e2c5961f (diff)
downloadcpython-8a14a0c88bf5b72da899c9ce9863e14dcd48b9c7.zip
cpython-8a14a0c88bf5b72da899c9ce9863e14dcd48b9c7.tar.gz
cpython-8a14a0c88bf5b72da899c9ce9863e14dcd48b9c7.tar.bz2
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.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
index 3347e9e..164b6c2 100644
--- a/Lib/test/test_ssl.py
+++ b/Lib/test/test_ssl.py
@@ -474,7 +474,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