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

This commit is contained in:
Nadeem Vawda 2013-03-03 22:44:22 +01:00
commit ad246bfb71
2 changed files with 7 additions and 1 deletions

View File

@ -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.

View File

@ -635,6 +635,8 @@ Library
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