Skip to content

Commit 0de7332

Browse files
vstinnerlisroach
authored andcommitted
bpo-37322: ssl test_pha_required_nocert() ignores expected SSLError (pythonGH-14670)
test_ssl.test_pha_required_nocert() now uses support.catch_threading_exception() to ignore the expected SSLError in ConnectionHandler of ThreadedEchoServer (it is only raised sometimes on Windows).
1 parent 9ec883f commit 0de7332

File tree

1 file changed

+18
-15
lines changed

1 file changed

+18
-15
lines changed

Lib/test/test_ssl.py

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4326,21 +4326,24 @@ def test_pha_required_nocert(self):
43264326
server_context.verify_mode = ssl.CERT_REQUIRED
43274327
client_context.post_handshake_auth = True
43284328

4329-
server = ThreadedEchoServer(context=server_context, chatty=False)
4330-
with server:
4331-
with client_context.wrap_socket(socket.socket(),
4332-
server_hostname=hostname) as s:
4333-
s.connect((HOST, server.port))
4334-
s.write(b'PHA')
4335-
# receive CertificateRequest
4336-
self.assertEqual(s.recv(1024), b'OK\n')
4337-
# send empty Certificate + Finish
4338-
s.write(b'HASCERT')
4339-
# receive alert
4340-
with self.assertRaisesRegex(
4341-
ssl.SSLError,
4342-
'tlsv13 alert certificate required'):
4343-
s.recv(1024)
4329+
# Ignore expected SSLError in ConnectionHandler of ThreadedEchoServer
4330+
# (it is only raised sometimes on Windows)
4331+
with support.catch_threading_exception() as cm:
4332+
server = ThreadedEchoServer(context=server_context, chatty=False)
4333+
with server:
4334+
with client_context.wrap_socket(socket.socket(),
4335+
server_hostname=hostname) as s:
4336+
s.connect((HOST, server.port))
4337+
s.write(b'PHA')
4338+
# receive CertificateRequest
4339+
self.assertEqual(s.recv(1024), b'OK\n')
4340+
# send empty Certificate + Finish
4341+
s.write(b'HASCERT')
4342+
# receive alert
4343+
with self.assertRaisesRegex(
4344+
ssl.SSLError,
4345+
'tlsv13 alert certificate required'):
4346+
s.recv(1024)
43444347

43454348
def test_pha_optional(self):
43464349
if support.verbose:

0 commit comments

Comments
 (0)