Skip to content

Commit 1be6770

Browse files
miss-islingtonserhiy-storchakaclaude
authored
[3.15] gh-125860: Skip separate-SCM_RIGHTS socket tests on NetBSD, OpenBSD and DragonFly (GH-154239) (GH-154245)
(cherry picked from commit 9cfa08c) Co-authored-by: Serhiy Storchaka <storchaka@gmail.com> Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
1 parent c6c1e9d commit 1be6770

1 file changed

Lines changed: 8 additions & 0 deletions

File tree

Lib/test/test_socket.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,10 @@
5555
VSOCKPORT = 1234
5656
AIX = platform.system() == "AIX"
5757
SOLARIS = sys.platform.startswith("sunos")
58+
# NetBSD, OpenBSD and DragonFly deliver the file descriptors from only one
59+
# SCM_RIGHTS control message when several are sent in a single sendmsg().
60+
BSD_COMBINES_SCM_RIGHTS = sys.platform.startswith(
61+
("netbsd", "openbsd", "dragonfly"))
5862
WSL = "microsoft-standard-WSL" in platform.release()
5963

6064
try:
@@ -4177,6 +4181,7 @@ def _testFDPassCMSG_LEN(self):
41774181
@unittest.skipIf(is_apple, "skipping, see issue #12958")
41784182
@unittest.skipIf(SOLARIS, "skipping, see gh-91214")
41794183
@unittest.skipIf(AIX, "skipping, see issue #22397")
4184+
@unittest.skipIf(BSD_COMBINES_SCM_RIGHTS, "skipping, see gh-125860")
41804185
@requireAttrs(socket, "CMSG_SPACE")
41814186
def testFDPassSeparate(self):
41824187
# Pass two FDs in two separate arrays. Arrays may be combined
@@ -4189,6 +4194,7 @@ def testFDPassSeparate(self):
41894194
@unittest.skipIf(is_apple, "skipping, see issue #12958")
41904195
@unittest.skipIf(SOLARIS, "skipping, see gh-91214")
41914196
@unittest.skipIf(AIX, "skipping, see issue #22397")
4197+
@unittest.skipIf(BSD_COMBINES_SCM_RIGHTS, "skipping, see gh-125860")
41924198
def _testFDPassSeparate(self):
41934199
fd0, fd1 = self.newFDs(2)
41944200
self.assertEqual(
@@ -4203,6 +4209,7 @@ def _testFDPassSeparate(self):
42034209
@unittest.skipIf(is_apple, "skipping, see issue #12958")
42044210
@unittest.skipIf(SOLARIS, "skipping, see gh-91214")
42054211
@unittest.skipIf(AIX, "skipping, see issue #22397")
4212+
@unittest.skipIf(BSD_COMBINES_SCM_RIGHTS, "skipping, see gh-125860")
42064213
@requireAttrs(socket, "CMSG_SPACE")
42074214
def testFDPassSeparateMinSpace(self):
42084215
# Pass two FDs in two separate arrays, receiving them into the
@@ -4218,6 +4225,7 @@ def testFDPassSeparateMinSpace(self):
42184225
@unittest.skipIf(is_apple, "skipping, see issue #12958")
42194226
@unittest.skipIf(SOLARIS, "skipping, see gh-91214")
42204227
@unittest.skipIf(AIX, "skipping, see issue #22397")
4228+
@unittest.skipIf(BSD_COMBINES_SCM_RIGHTS, "skipping, see gh-125860")
42214229
def _testFDPassSeparateMinSpace(self):
42224230
fd0, fd1 = self.newFDs(2)
42234231
self.assertEqual(

0 commit comments

Comments
 (0)