Matej Cepl
6787a9f29d
failing test_sendfile_close_peer_in_the_middle_of_receiving tests on Linux >= 6.10 (GH-120227). OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python313?expand=0&rev=43
49 lines
2.3 KiB
Diff
49 lines
2.3 KiB
Diff
From 235fbc05dcbca5cb5f7f0cd836317b8426e33243 Mon Sep 17 00:00:00 2001
|
|
From: Petr Viktorin <encukou@gmail.com>
|
|
Date: Wed, 28 Aug 2024 22:36:42 +0200
|
|
Subject: [PATCH] gh-122136: test_asyncio: Don't fail if the kernel buffers
|
|
more data than advertised (GH-123423) (cherry picked from commit
|
|
b379f1b26c1e89c8e9160b4dede61b980cc77be6)
|
|
|
|
Co-authored-by: Petr Viktorin <encukou@gmail.com>
|
|
---
|
|
Lib/test/test_asyncio/test_server.py | 18 +++++++++++++-----
|
|
1 file changed, 13 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/Lib/test/test_asyncio/test_server.py b/Lib/test/test_asyncio/test_server.py
|
|
index 4ca8a166a0f1a1..60a40cc8349fed 100644
|
|
--- a/Lib/test/test_asyncio/test_server.py
|
|
+++ b/Lib/test/test_asyncio/test_server.py
|
|
@@ -227,7 +227,7 @@ async def serve(rd, wr):
|
|
|
|
(s_rd, s_wr) = await fut
|
|
|
|
- # Limit the socket buffers so we can reliably overfill them
|
|
+ # Limit the socket buffers so we can more reliably overfill them
|
|
s_sock = s_wr.get_extra_info('socket')
|
|
s_sock.setsockopt(socket.SOL_SOCKET, socket.SO_SNDBUF, 65536)
|
|
c_sock = c_wr.get_extra_info('socket')
|
|
@@ -242,10 +242,18 @@ async def serve(rd, wr):
|
|
await asyncio.sleep(0)
|
|
|
|
# Get the writer in a waiting state by sending data until the
|
|
- # socket buffers are full on both server and client sockets and
|
|
- # the kernel stops accepting more data
|
|
- s_wr.write(b'a' * c_sock.getsockopt(socket.SOL_SOCKET, socket.SO_RCVBUF))
|
|
- s_wr.write(b'a' * s_sock.getsockopt(socket.SOL_SOCKET, socket.SO_SNDBUF))
|
|
+ # kernel stops accepting more data in the send buffer.
|
|
+ # gh-122136: getsockopt() does not reliably report the buffer size
|
|
+ # available for message content.
|
|
+ # We loop until we start filling up the asyncio buffer.
|
|
+ # To avoid an infinite loop we cap at 10 times the expected value
|
|
+ c_bufsize = c_sock.getsockopt(socket.SOL_SOCKET, socket.SO_RCVBUF)
|
|
+ s_bufsize = s_sock.getsockopt(socket.SOL_SOCKET, socket.SO_SNDBUF)
|
|
+ for i in range(10):
|
|
+ s_wr.write(b'a' * c_bufsize)
|
|
+ s_wr.write(b'a' * s_bufsize)
|
|
+ if s_wr.transport.get_write_buffer_size() > 0:
|
|
+ break
|
|
self.assertNotEqual(s_wr.transport.get_write_buffer_size(), 0)
|
|
|
|
task = asyncio.create_task(srv.wait_closed())
|