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

Fix a flaky test introduced in 13dc2fde8c.

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.
This commit is contained in:
Bénédikt Tran 2025-10-05 18:51:16 +02:00 committed by GitHub
parent 6edb2ddb5f
commit 1fe89d324e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -391,12 +391,13 @@ def test_single_request(self):
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):