https://github.com/python/cpython/commit/5c2191df9a21a3b3d49dd0711b8d2b92591... commit: 5c2191df9a21a3b3d49dd0711b8d2b92591ce82b branch: main author: Victor Stinner <vstinner@python.org> committer: vstinner <vstinner@python.org> date: 2021-06-03T22:12:31+02:00 summary: bpo-43921: Cleanup test_ssl.test_wrong_cert_tls13() (GH-26520) Don't catch OSError, and check the SSLError message. files: M Lib/test/test_ssl.py diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py index 85ad8ae827a80..fdf5f19d8d4c5 100644 --- a/Lib/test/test_ssl.py +++ b/Lib/test/test_ssl.py @@ -3192,23 +3192,16 @@ def test_wrong_cert_tls13(self): client_context.wrap_socket(socket.socket(), server_hostname=hostname, suppress_ragged_eofs=False) as s: - # TLS 1.3 perform client cert exchange after handshake s.connect((HOST, server.port)) - try: + with self.assertRaisesRegex( + ssl.SSLError, + 'alert unknown ca|EOF occurred' + ): + # TLS 1.3 perform client cert exchange after handshake s.write(b'data') s.read(1000) s.write(b'should have failed already') s.read(1000) - except ssl.SSLError as e: - if support.verbose: - sys.stdout.write("\nSSLError is %r\n" % e) - except OSError as e: - if e.errno != errno.ECONNRESET: - raise - if support.verbose: - sys.stdout.write("\nsocket.error is %r\n" % e) - else: - self.fail("Use of invalid cert should have failed!") def test_rude_shutdown(self): """A brutal shutdown of an SSL server should raise an OSError