Skip to content

gh-149879: Fix test_ssl on Cygwin #150419

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vstinner merged 4 commits into from
May 25, 2026
+11 −3
Merged

gh-149879: Fix test_ssl on Cygwin #150419

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
db3a4d6
gh-149879: Fix test_ssl on Cygwin
vstinner May 25, 2026
bca7a45
Avoid BlockingIOError, use EAGAIN instead
vstinner May 25, 2026
8f84a29
Fix merge mistake
vstinner May 25, 2026
9b9ba2f
Only ignore EAGAIN on Cygwin
vstinner May 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion Lib/ssl.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1055,7 +1055,12 @@ def _create(cls, sock, server_side=False, do_handshake_on_connect=True,
notconn_pre_handshake_data = self.recv(1)
except OSError as e:
# EINVAL occurs for recv(1) on non-connected on unix sockets.
if e.errno not in (errno.ENOTCONN, errno.EINVAL):
if e.errno in (errno.ENOTCONN, errno.EINVAL):
pass
elif sys.platform == 'cygwin' and e.errno == errno.EAGAIN:
# EAGAIN occurs on Cygwin.
pass
else:
raise
notconn_pre_handshake_data = b''
self.setblocking(blocking)
Expand Down
7 changes: 5 additions & 2 deletions Lib/test/test_ssl.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -638,6 +638,7 @@ def test_refcycle(self):
del ss
self.assertEqual(wr(), None)

@unittest.skipIf(sys.platform == 'cygwin', 'test hangs on Cygwin')
def test_wrapped_unconnected(self):
# Methods on an unconnected SSLSocket propagate the original
# OSError raise by the underlying socket object.
Expand Down Expand Up @@ -3631,7 +3632,7 @@ def test_wrong_cert_tls13(self):
OSError,
'alert unknown ca|EOF occurred|TLSV1_ALERT_UNKNOWN_CA|'
'closed by the remote host|Connection reset by peer|'
'Broken pipe'
'Broken pipe|Software caused connection abort'
):
# TLS 1.3 perform client cert exchange after handshake
s.write(b'data')
Expand Down Expand Up @@ -4585,6 +4586,8 @@ def test_client_sigalgs_mismatch(self):
ssl.SSLError,
# On handshake failures, some systems raise a ConnectionResetError.
ConnectionResetError,
# On handshake failures, Cygwin raises ConnectionAbortedError.
ConnectionAbortedError,
# On handshake failures, macOS may raise a BrokenPipeError.
# See https://github.com/python/cpython/issues/139504.
BrokenPipeError,
Expand Down Expand Up @@ -5693,7 +5696,7 @@ def run(self):
def non_linux_skip_if_other_okay_error(self, err):
if sys.platform in ("linux", "android"):
return # Expect the full test setup to always work on Linux.
if (isinstance(err, ConnectionResetError) or
if (isinstance(err, (ConnectionResetError, ConnectionAbortedError)) or
(isinstance(err, OSError) and err.errno == errno.EINVAL) or
re.search('wrong.version.number', str(getattr(err, "reason", "")), re.I) or
re.search('record.layer.failure', str(getattr(err, "reason", "")), re.I)
Expand Down
Loading