gh-70765: fix an HTTP/0.9 flaky test post GH-139514 (#139610)

Fix a flaky test introduced in 13dc2fde8cec1e8aad04c7635b3da4ff3e3dcb00.

After a single HTTP/0.9 request, both client and server are expected to
close the connection on their side. In particular, if a client sends two
requests with the same connection, only the first one should be handled.

In the tests, it might happen that checking for the second request to be
ignored did not take into account that the server may have already closed
the connection. This flaky behavior was first observed on macOS CI workers
but could not be reproduced locally on a Linux machine.

diff --git a/Lib/test/test_httpservers.py b/Lib/test/test_httpservers.py
index 85d3a346439f6a774c9255f43bbb69b0c2f661ad..7da5e3a19575889f7a8ba393a01cef0b3430704e 100644 (file)
--- a/Lib/test/test_httpservers.py
+++ b/Lib/test/test_httpservers.py
@@ -391,12 +391,13 @@ class HTTP09ServerTestCase(BaseTestCase):
         res = self.sock.recv(1024)
         self.assertEqual(res, b"OK: here is /foo.html\r\n")
 
-        self.sock.send(b'GET /bar.html\r\n')
-        res = self.sock.recv(1024)
-        # The server will not parse more input as it closed the connection.
-        # Note that the socket connection itself is still opened since the
-        # client is responsible for also closing it on their side.
-        self.assertEqual(res, b'')
+        # Ignore errors if the connection is already closed,
+        # as this is the expected behavior of HTTP/0.9.
+        with contextlib.suppress(OSError):
+            self.sock.send(b'GET /bar.html\r\n')
+            res = self.sock.recv(1024)
+            # The server should not process our request.
+            self.assertEqual(res, b'')
 
 
 def certdata_file(*path):