Skip to content

Commit 9f5fe6b

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

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
@@ -53,6 +53,10 @@
5353
VSOCKPORT = 1234
5454
AIX = platform.system() == "AIX"
5555
SOLARIS = sys.platform.startswith("sunos")
56+
# NetBSD, OpenBSD and DragonFly deliver the file descriptors from only one
57+
# SCM_RIGHTS control message when several are sent in a single sendmsg().
58+
BSD_COMBINES_SCM_RIGHTS = sys.platform.startswith(
59+
("netbsd", "openbsd", "dragonfly"))
5660
WSL = "microsoft-standard-WSL" in platform.release()
5761

5862
try:
@@ -3972,6 +3976,7 @@ def _testFDPassCMSG_LEN(self):
39723976
@unittest.skipIf(is_apple, "skipping, see issue #12958")
39733977
@unittest.skipIf(SOLARIS, "skipping, see gh-91214")
39743978
@unittest.skipIf(AIX, "skipping, see issue #22397")
3979+
@unittest.skipIf(BSD_COMBINES_SCM_RIGHTS, "skipping, see gh-125860")
39753980
@requireAttrs(socket, "CMSG_SPACE")
39763981
def testFDPassSeparate(self):
39773982
# Pass two FDs in two separate arrays. Arrays may be combined
@@ -3984,6 +3989,7 @@ def testFDPassSeparate(self):
39843989
@unittest.skipIf(is_apple, "skipping, see issue #12958")
39853990
@unittest.skipIf(SOLARIS, "skipping, see gh-91214")
39863991
@unittest.skipIf(AIX, "skipping, see issue #22397")
3992+
@unittest.skipIf(BSD_COMBINES_SCM_RIGHTS, "skipping, see gh-125860")
39873993
def _testFDPassSeparate(self):
39883994
fd0, fd1 = self.newFDs(2)
39893995
self.assertEqual(
@@ -3998,6 +4004,7 @@ def _testFDPassSeparate(self):
39984004
@unittest.skipIf(is_apple, "skipping, see issue #12958")
39994005
@unittest.skipIf(SOLARIS, "skipping, see gh-91214")
40004006
@unittest.skipIf(AIX, "skipping, see issue #22397")
4007+
@unittest.skipIf(BSD_COMBINES_SCM_RIGHTS, "skipping, see gh-125860")
40014008
@requireAttrs(socket, "CMSG_SPACE")
40024009
def testFDPassSeparateMinSpace(self):
40034010
# Pass two FDs in two separate arrays, receiving them into the
@@ -4013,6 +4020,7 @@ def testFDPassSeparateMinSpace(self):
40134020
@unittest.skipIf(is_apple, "skipping, see issue #12958")
40144021
@unittest.skipIf(SOLARIS, "skipping, see gh-91214")
40154022
@unittest.skipIf(AIX, "skipping, see issue #22397")
4023+
@unittest.skipIf(BSD_COMBINES_SCM_RIGHTS, "skipping, see gh-125860")
40164024
def _testFDPassSeparateMinSpace(self):
40174025
fd0, fd1 = self.newFDs(2)
40184026
self.assertEqual(

0 commit comments

Comments
 (0)