traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
Nadeem Vawda 2013-03-03 22:31:21 +01:00
parent fed69ba63c
commit 7b39b9b51b
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Lib/test/test_ssl.py
View File

@ -774,7 +774,13 @@ else:
try: try:
self.sslconn = self.server.context.wrap_socket( self.sslconn = self.server.context.wrap_socket(
self.sock, server_side=True) 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 # XXX Various errors can have happened here, for example
# a mismatching protocol version, an invalid certificate, # a mismatching protocol version, an invalid certificate,
# or a low-level bug. This should be made more discriminating. # or a low-level bug. This should be made more discriminating.

2
Misc/NEWS
View File

@ -947,6 +947,8 @@ Extension Modules
Tests 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 #17249: convert a test in test_capi to use unittest and reap threads.
- Issue #17041: Fix testing when Python is configured with the - Issue #17041: Fix testing when Python is configured with the