Enhance test

Co-authored-by: Gregory P. Smith <greg@krypto.org>

Author: vstinner

Lib/test/test_ssl.py

@@ -2854,6 +2854,7 @@ def run(self):
         context.load_cert_chain(CERTFILE)
         server_sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
         with server_sock:
+            server_sock.settimeout(support.SHORT_TIMEOUT)
             server_sock.bind((HOST, 0))
             server_sock.listen(5)
 
@@ -2864,10 +2865,9 @@ def run(self):
             sslconn = context.wrap_socket(sock, server_side=True)
             with sslconn:
                 request = b''
-                while True:
-                    chunk = sslconn.recv(1024)
+                while chunk := sslconn.recv(1024):
                     request += chunk
-                    if b'\n' in request:
+                    if b'\n' in chunk:
                         break
 
                 sslconn.sendall(b'server\n')
@@ -5039,6 +5039,7 @@ def test_got_eof(self):
         server.start()
         if not server.listening.wait(support.SHORT_TIMEOUT):
             raise RuntimeError("server took too long")
+        self.addCleanup(server.join)
 
         context = ssl.create_default_context(cafile=CERTFILE)
         sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
@@ -5083,8 +5084,6 @@ def test_got_eof(self):
                 # raise an error
                 pass
 
-        server.join()
-
 
 @unittest.skipUnless(has_tls_version('TLSv1_3') and ssl.HAS_PHA,
                      "Test needs TLS 1.3 PHA")