Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

bpo-43921: Fix test_ssl.test_wrong_cert_tls13() on Windows (GH-26502) 

Fix test_ssl.test_wrong_cert_tls13(): use suppress_ragged_eofs=False,
since read() can raise ssl.SSLEOFError on Windows.
This commit is contained in:
Victor Stinner 2021-06-03 18:04:25 +02:00 committed by GitHub
parent 82ad22a97d
commit ea0210fa8c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Lib/test/test_ssl.py
View File

@ -3190,7 +3190,8 @@ class ThreadedTests(unittest.TestCase):
)
with server, \
client_context.wrap_socket(socket.socket(),
server_hostname=hostname) as s:
server_hostname=hostname,
suppress_ragged_eofs=False) as s:
# TLS 1.3 perform client cert exchange after handshake
s.connect((HOST, server.port))
try:
@ -3207,13 +3208,7 @@ class ThreadedTests(unittest.TestCase):
if support.verbose:
sys.stdout.write("\nsocket.error is %r\n" % e)
else:
if sys.platform == "win32":
self.skipTest(
"Ignoring failed test_wrong_cert_tls13 test case. "
"The test is flaky on Windows, see bpo-43921."
)
else:
self.fail("Use of invalid cert should have failed!")
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
@ -4450,7 +4445,8 @@ class TestPostHandshakeAuth(unittest.TestCase):
server = ThreadedEchoServer(context=server_context, chatty=True)
with server:
with client_context.wrap_socket(socket.socket(),
server_hostname=hostname) as s:
server_hostname=hostname,
suppress_ragged_eofs=False) as s:
s.connect((HOST, server.port))
s.write(b'PHA')
# test sometimes fails with EOF error. Test passes as long as
@ -4461,17 +4457,13 @@ class TestPostHandshakeAuth(unittest.TestCase):
):
# receive CertificateRequest
data = s.recv(1024)
if not data:
raise ssl.SSLError(1, "EOF occurred")
self.assertEqual(data, b'OK\n')
# send empty Certificate + Finish
s.write(b'HASCERT')
# receive alert
data = s.recv(1024)
if not data:
raise ssl.SSLError(1, "EOF occurred")
s.recv(1024)
def test_pha_optional(self):
if support.verbose:

3
Misc/NEWS.d/next/Tests/2021-06-03-03-29-34.bpo-43921.nwH1FS.rst Normal file
View File

@ -0,0 +1,3 @@
Fix test_ssl.test_wrong_cert_tls13(): use ``suppress_ragged_eofs=False``,
since ``read()`` can raise :exc:`ssl.SSLEOFError` on Windows. Patch by
Victor Stinner.