Skip to content

bpo-43921: Fix test_ssl.test_pha_required_nocert() #26489

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vstinner merged 1 commit into from
Jun 2, 2021
Merged

bpo-43921: Fix test_ssl.test_pha_required_nocert() #26489

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
bpo-43921: Fix test_ssl.test_pha_required_nocert() 
Fix test_pha_required_nocert() of test_ssl: catch two more EOF cases
(when the recv() method returns an empty string).
  • Loading branch information
@vstinner
vstinner committed Jun 2, 2021
commit df53b84901a65db990393726d18ffbb300de6f55
11 changes: 9 additions & 2 deletions Lib/test/test_ssl.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4460,11 +4460,18 @@ def msg_cb(conn, direction, version, content_type, msg_type, data):
'(certificate required|EOF occurred)'
):
# receive CertificateRequest
self.assertEqual(s.recv(1024), b'OK\n')
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
s.recv(1024)
data = s.recv(1024)
if not data:
raise ssl.SSLError(1, "EOF occurred")

def test_pha_optional(self):
if support.verbose:
Expand Down
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Tests/2021-06-02-17-41-42.bpo-43921.xP7yZ4.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fix test_pha_required_nocert() of test_ssl: catch two more EOF cases (when
the ``recv()`` method returns an empty string). Patch by Victor Stinner.