Apply suggestions from code review

keepworking · encukou · keepworking · commit d9f8a0bca52c · 2024-03-23T00:09:32.000+09:00
- merge ssl.SSLError and OSError as OSError
- append assertRaisesRegex for test_wrong_cert_tls13 ('Connection reset by peer')

Co-authored-by: Petr Viktorin &lt;encukou@gmail.com&gt;
diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
@@ -3095,8 +3095,8 @@ def test_wrong_cert_tls13(self):
                                         suppress_ragged_eofs=False) as s:
             s.connect((HOST, server.port))
             with self.assertRaisesRegex(
-                (ssl.SSLError, OSError),
-                '(alert unknown ca|EOF occurred|closed by the remote host)'
+                OSError,
+                'alert unknown ca|EOF occurred|TLSV1_ALERT_UNKNOWN_CA|closed by the remote host|Connection reset by peer'
             ):
                 # TLS 1.3 perform client cert exchange after handshake
                 s.write(b'data')
@@ -4448,7 +4448,7 @@ def msg_cb(conn, direction, version, content_type, msg_type, data):
                 # test sometimes fails with EOF error. Test passes as long as
                 # server aborts connection with an error.
                 with self.assertRaisesRegex(
-                    (ssl.SSLError, OSError),
+                    OSError,
                     '(certificate required|EOF occurred|closed by the remote host)'
                 ):
                     # receive CertificateRequest
