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

Lib/test/test_ssl.py

@@ -979,7 +979,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.

Misc/NEWS

@@ -887,6 +887,8 @@ Extension Modules
 Tests
 -----
 
+- Issue #13898: test_ssl no longer prints a spurious stack trace on Ubuntu.
+
 - Issue #17283: Share code between `__main__.py` and `regrtest.py` in
   `Lib/test`.