From: Victor Stinner <vstinner@python.org>
Date: Thu, 3 Jun 2021 20:12:31 +0000 (+0200)
Subject: bpo-43921: Cleanup test_ssl.test_wrong_cert_tls13() (GH-26520)
X-Git-Tag: v3.11.0a1~950
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5c2191df9a21a3b3d49dd0711b8d2b92591ce82b;p=thirdparty%2FPython%2Fcpython.git

bpo-43921: Cleanup test_ssl.test_wrong_cert_tls13() (GH-26520)

Don't catch OSError, and check the SSLError message.
---

diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
index 85ad8ae827a8..fdf5f19d8d4c 100644
--- a/Lib/test/test_ssl.py
+++ b/Lib/test/test_ssl.py
@@ -3192,23 +3192,16 @@ class ThreadedTests(unittest.TestCase):
              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