Skip to content

Commit 2e09851

Browse files
committed
gh-122136: test_asyncio: Don't fail if the kernel buffers more data than advertised
1 parent 4c6dca8 commit 2e09851

File tree

1 file changed

+13
-5
lines changed

1 file changed

+13
-5
lines changed

Lib/test/test_asyncio/test_server.py

+13-5
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ async def serve(rd, wr):
227227

228228
(s_rd, s_wr) = await fut
229229

230-
# Limit the socket buffers so we can reliably overfill them
230+
# Limit the socket buffers so we can more reliably overfill them
231231
s_sock = s_wr.get_extra_info('socket')
232232
s_sock.setsockopt(socket.SOL_SOCKET, socket.SO_SNDBUF, 65536)
233233
c_sock = c_wr.get_extra_info('socket')
@@ -242,10 +242,18 @@ async def serve(rd, wr):
242242
await asyncio.sleep(0)
243243

244244
# Get the writer in a waiting state by sending data until the
245-
# socket buffers are full on both server and client sockets and
246-
# the kernel stops accepting more data
247-
s_wr.write(b'a' * c_sock.getsockopt(socket.SOL_SOCKET, socket.SO_RCVBUF))
248-
s_wr.write(b'a' * s_sock.getsockopt(socket.SOL_SOCKET, socket.SO_SNDBUF))
245+
# kernel stops accepting more data in the send buffer.
246+
# gh-122136: getsockopt() does not reliably report the buffer size
247+
# available for message content.
248+
# We loop until we start filling up the asyncio buffer.
249+
# To avoid an infinite loop we cap at 10 times the expected value
250+
c_bufsize = c_sock.getsockopt(socket.SOL_SOCKET, socket.SO_RCVBUF)
251+
s_bufsize = s_sock.getsockopt(socket.SOL_SOCKET, socket.SO_SNDBUF)
252+
for i in range(10):
253+
s_wr.write(b'a' * c_bufsize)
254+
s_wr.write(b'a' * s_bufsize)
255+
if s_wr.transport.get_write_buffer_size() > 0:
256+
break
249257
self.assertNotEqual(s_wr.transport.get_write_buffer_size(), 0)
250258

251259
task = asyncio.create_task(srv.wait_closed())

0 commit comments

Comments
 (0)