From: Xi Ruoyao Date: Fri, 7 Jun 2024 15:51:32 +0000 (+0800) Subject: gh-120226: Fix test_sendfile_close_peer_in_the_middle_of_receiving on Linux >= 6... X-Git-Tag: v3.14.0a1~1563 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a7584245661102a5768c643fbd7db8395fd3c90e;p=thirdparty%2FPython%2Fcpython.git gh-120226: Fix test_sendfile_close_peer_in_the_middle_of_receiving on Linux >= 6.10 (#120227) The worst case is that the kernel buffers 17 pages with a page size of 64k. --- diff --git a/Lib/test/test_asyncio/test_sendfile.py b/Lib/test/test_asyncio/test_sendfile.py index d33ff197bbfa..2509d4382cde 100644 --- a/Lib/test/test_asyncio/test_sendfile.py +++ b/Lib/test/test_asyncio/test_sendfile.py @@ -93,13 +93,10 @@ class MyProto(asyncio.Protocol): class SendfileBase: - # 256 KiB plus small unaligned to buffer chunk - # Newer versions of Windows seems to have increased its internal - # buffer and tries to send as much of the data as it can as it - # has some form of buffering for this which is less than 256KiB - # on newer server versions and Windows 11. - # So DATA should be larger than 256 KiB to make this test reliable. - DATA = b"x" * (1024 * 256 + 1) + # Linux >= 6.10 seems buffering up to 17 pages of data. + # So DATA should be large enough to make this test reliable even with a + # 64 KiB page configuration. + DATA = b"x" * (1024 * 17 * 64 + 1) # Reduce socket buffer size to test on relative small data sets. BUF_SIZE = 4 * 1024 # 4 KiB