traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Issue #17684: Fix some test_socket failures due to limited FD passing support 

on OS-X. Patch by Jeff Ramnani.
This commit is contained in:
Charles-Francois Natali 2013-05-20 19:08:19 +02:00
parent ca97fd3053
commit dd225e4c64
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Lib/test/test_socket.py
View File

@ -2533,8 +2533,7 @@ class SCMRightsTest(SendrecvmsgServerTimeoutBase):
def _testFDPassCMSG_LEN(self): def _testFDPassCMSG_LEN(self):
self.createAndSendFDs(1) self.createAndSendFDs(1)
# Issue #12958: The following test has problems on Mac OS X @unittest.skipIf(sys.platform == "darwin", "skipping, see issue #12958")
@support.anticipate_failure(sys.platform == "darwin")
@requireAttrs(socket, "CMSG_SPACE") @requireAttrs(socket, "CMSG_SPACE")
def testFDPassSeparate(self): def testFDPassSeparate(self):
# Pass two FDs in two separate arrays. Arrays may be combined # Pass two FDs in two separate arrays. Arrays may be combined
@ -2544,7 +2543,7 @@ class SCMRightsTest(SendrecvmsgServerTimeoutBase):
maxcmsgs=2) maxcmsgs=2)
@testFDPassSeparate.client_skip @testFDPassSeparate.client_skip
@support.anticipate_failure(sys.platform == "darwin") @unittest.skipIf(sys.platform == "darwin", "skipping, see issue #12958")
def _testFDPassSeparate(self): def _testFDPassSeparate(self):
fd0, fd1 = self.newFDs(2) fd0, fd1 = self.newFDs(2)
self.assertEqual( self.assertEqual(
@ -2556,8 +2555,7 @@ class SCMRightsTest(SendrecvmsgServerTimeoutBase):
array.array("i", [fd1]))]), array.array("i", [fd1]))]),
len(MSG)) len(MSG))
# Issue #12958: The following test has problems on Mac OS X @unittest.skipIf(sys.platform == "darwin", "skipping, see issue #12958")
@support.anticipate_failure(sys.platform == "darwin")
@requireAttrs(socket, "CMSG_SPACE") @requireAttrs(socket, "CMSG_SPACE")
def testFDPassSeparateMinSpace(self): def testFDPassSeparateMinSpace(self):
# Pass two FDs in two separate arrays, receiving them into the # Pass two FDs in two separate arrays, receiving them into the
@ -2569,7 +2567,7 @@ class SCMRightsTest(SendrecvmsgServerTimeoutBase):
maxcmsgs=2, ignoreflags=socket.MSG_CTRUNC) maxcmsgs=2, ignoreflags=socket.MSG_CTRUNC)
@testFDPassSeparateMinSpace.client_skip @testFDPassSeparateMinSpace.client_skip
@support.anticipate_failure(sys.platform == "darwin") @unittest.skipIf(sys.platform == "darwin", "skipping, see issue #12958")
def _testFDPassSeparateMinSpace(self): def _testFDPassSeparateMinSpace(self):
fd0, fd1 = self.newFDs(2) fd0, fd1 = self.newFDs(2)
self.assertEqual( self.assertEqual(