From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Wed, 2 Jun 2021 23:48:40 +0000 (-0700)
Subject: bpo-43921: Fix test_ssl.test_pha_required_nocert() (GH-26489)
X-Git-Tag: v3.10.0b3~69
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e5e93e6145090a636e67766a53b758d7ac78e3ad;p=thirdparty%2FPython%2Fcpython.git

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


Fix test_pha_required_nocert() of test_ssl: catch two more EOF cases
(when the recv() method returns an empty string).
(cherry picked from commit 320eaa7f42b413cd5e5436ec92d4dc5ba150395f)

Co-authored-by: Victor Stinner <vstinner@python.org>
---

diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
index 00d5eff81537..fbd0131ea4f4 100644
--- a/Lib/test/test_ssl.py
+++ b/Lib/test/test_ssl.py
@@ -4464,11 +4464,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 000000000000..83146c785246
--- /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.