Skip to content

Commit addef07

Browse files
Fix tests in test_socket to use correctly CMSG_LEN (GH-9594)
After some failures in AMD64 FreeBSD CURRENT Debug 3.x buildbots regarding tests in test_socket that are using testFDPassSeparateMinSpace(), FreeBDS revision 337423 was pointed out to be the reason the test started to fail. A close examination of the manpage for cmsg_space(3) reveals that the number of file descriptors needs to be taken into account when using CMSG_LEN(). This commit fixes tests in test_socket to use correctly CMSG_LEN, taking into account the number of FDs. (cherry picked from commit 7291108) Co-authored-by: Pablo Galindo <Pablogsal@gmail.com>
1 parent 2b01121 commit addef07

1 file changed

Lines changed: 3 additions & 2 deletions

File tree

Lib/test/test_socket.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3183,10 +3183,11 @@ def _testFDPassSeparate(self):
31833183
def testFDPassSeparateMinSpace(self):
31843184
# Pass two FDs in two separate arrays, receiving them into the
31853185
# minimum space for two arrays.
3186-
self.checkRecvmsgFDs(2,
3186+
num_fds = 2
3187+
self.checkRecvmsgFDs(num_fds,
31873188
self.doRecvmsg(self.serv_sock, len(MSG),
31883189
socket.CMSG_SPACE(SIZEOF_INT) +
3189-
socket.CMSG_LEN(SIZEOF_INT)),
3190+
socket.CMSG_LEN(SIZEOF_INT * num_fds)),
31903191
maxcmsgs=2, ignoreflags=socket.MSG_CTRUNC)
31913192

31923193
@testFDPassSeparateMinSpace.client_skip

0 commit comments

Comments
 (0)