From: Charles-Francois Natali <cf.natali@gmail.com>
Date: Mon, 20 May 2013 17:08:19 +0000 (+0200)
Subject: Issue #17684: Fix some test_socket failures due to limited FD passing support
X-Git-Tag: v3.4.0a2~308^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dd225e4c643507f2d8c6f222edbfe4a6df2d2b88;p=python

Issue #17684: Fix some test_socket failures due to limited FD passing support
on OS-X. Patch by Jeff Ramnani.
---

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