Commit 7b39b9b5 authored by Nadeem Vawda's avatar Nadeem Vawda

Issue #13898: test_ssl no longer prints a spurious stack trace on Ubuntu.

parent fed69ba6
......@@ -774,7 +774,13 @@ else:
try:
self.sslconn = self.server.context.wrap_socket(
self.sock, server_side=True)
except ssl.SSLError as e:
except (ssl.SSLError, socket.error) as e:
# Treat ECONNRESET as though it were an SSLError - OpenSSL
# on Ubuntu abruptly closes the connection when asked to use
# an unsupported protocol.
if (not isinstance(e, ssl.SSLError) and
e.errno != errno.ECONNRESET):
raise
# XXX Various errors can have happened here, for example
# a mismatching protocol version, an invalid certificate,
# or a low-level bug. This should be made more discriminating.
......
......@@ -947,6 +947,8 @@ Extension Modules
Tests
-----
- Issue #13898: test_ssl no longer prints a spurious stack trace on Ubuntu.
- Issue #17249: convert a test in test_capi to use unittest and reap threads.
- Issue #17041: Fix testing when Python is configured with the
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment