summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Lib/test/test_ssl.py11
-rw-r--r--Misc/NEWS.d/next/Tests/2021-06-02-17-41-42.bpo-43921.xP7yZ4.rst2
2 files changed, 11 insertions, 2 deletions
diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
index 0d38d77..2df6232 100644
--- a/Lib/test/test_ssl.py
+++ b/Lib/test/test_ssl.py
@@ -4460,11 +4460,18 @@ class TestPostHandshakeAuth(unittest.TestCase):
'(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:
diff --git a/Misc/NEWS.d/next/Tests/2021-06-02-17-41-42.bpo-43921.xP7yZ4.rst b/Misc/NEWS.d/next/Tests/2021-06-02-17-41-42.bpo-43921.xP7yZ4.rst
new file mode 100644
index 0000000..83146c7
--- /dev/null
+++ b/Misc/NEWS.d/next/Tests/2021-06-02-17-41-42.bpo-43921.xP7yZ4.rst
@@ -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.