mirror of https://github.com/python/cpython
Issue #13898: test_ssl no longer prints a spurious stack trace on Ubuntu.
This commit is contained in:
commit
ad246bfb71
|
@ -942,7 +942,11 @@ else:
|
|||
self.sslconn = self.server.context.wrap_socket(
|
||||
self.sock, server_side=True)
|
||||
self.server.selected_protocols.append(self.sslconn.selected_npn_protocol())
|
||||
except ssl.SSLError as e:
|
||||
except (ssl.SSLError, ConnectionResetError) as e:
|
||||
# We treat ConnectionResetError as though it were an
|
||||
# SSLError - OpenSSL on Ubuntu abruptly closes the
|
||||
# connection when asked to use an unsupported protocol.
|
||||
#
|
||||
# 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.
|
||||
|
|
Loading…
Reference in New Issue