Skip to content

gh-112341: Specify the exact file size if offset is non zero in socket.sendfile #112342

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
aisk wants to merge 4 commits into from
Closed

gh-112341: Specify the exact file size if offset is non zero in socket.sendfile #112342

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e55715b
specify the exact filesize if offset is non zero in socket.sendfile
aisk Nov 23, 2023
5f460cb
Merge branch 'main' into fix-blocksize-in-sendfile
erlend-aasland Jan 6, 2024
88367ab
add test
aisk Jan 11, 2024
ddc44b8
Merge branch 'main' into fix-blocksize-in-sendfile
erlend-aasland Jan 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
add test
  • Loading branch information
@aisk
aisk committed Jan 11, 2024
commit 88367abd9257c04671d197c4b22f90e9b982055a
23 changes: 23 additions & 0 deletions Lib/test/test_socket.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import unittest
from unittest import mock
from test import support
from test.support import os_helper
from test.support import socket_helper
Expand Down Expand Up @@ -6433,6 +6434,28 @@ class SendfileUsingSendfileTest(SendfileUsingSendTest):
def meth_from_sock(self, sock):
return getattr(sock, "_sendfile_use_sendfile")

def _test_blocksize(self):
address = self.serv.getsockname()
file = open(os_helper.TESTFN, 'rb')
with socket.create_connection(address) as sock, file as file:
meth = self.meth_from_sock(sock)
with mock.patch('os.sendfile', wraps=os.sendfile) as mocked:
sent = meth(file, offset=10)
self.assertEqual(mocked.call_count, 2)
# blocksize is the blocksize argument in first call.
blocksize = mocked.call_args_list[0][0][3]
self.assertEqual(blocksize, self.FILESIZE - 10)
self.assertEqual(sent, self.FILESIZE - 10)
self.assertEqual(file.tell(), self.FILESIZE)

def test_blocksize(self):
# gh-112341: Check whether the blocksize is exactly fsize - offset if
# count is not specified when calling os.sendfile.
conn = self.accept_conn()
data = self.recv_data(conn)
self.assertEqual(len(data), self.FILESIZE - 10)
self.assertEqual(data, self.FILEDATA[10:])


@unittest.skipUnless(HAVE_SOCKET_ALG, 'AF_ALG required')
class LinuxKernelCryptoAPI(unittest.TestCase):
Expand Down