diff options
| author | Charles-Francois Natali <cf.natali@gmail.com> | 2013-05-20 17:08:19 (GMT) |
|---|---|---|
| committer | Charles-Francois Natali <cf.natali@gmail.com> | 2013-05-20 17:08:19 (GMT) |
| commit | d66b10e165d784ae7ea0d875f11153f1dff76fd8 (patch) | |
| tree | 8c392973e7c0421cf5dd84a8cfcdf3d6fa6d0fe1 /Lib | |
| parent | 7c4f8dacf45b9c327cdd075f5ee17087151c7f3b (diff) | |
| download | cpython-d66b10e165d784ae7ea0d875f11153f1dff76fd8.zip cpython-d66b10e165d784ae7ea0d875f11153f1dff76fd8.tar.gz cpython-d66b10e165d784ae7ea0d875f11153f1dff76fd8.tar.bz2 | |
Issue #17684: Fix some test_socket failures due to limited FD passing support
on OS-X. Patch by Jeff Ramnani.
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/test/test_socket.py | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py index 4693ea5..546d793 100644 --- a/Lib/test/test_socket.py +++ b/Lib/test/test_socket.py @@ -2618,8 +2618,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 @@ -2629,7 +2628,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( @@ -2641,8 +2640,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 @@ -2654,7 +2652,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( |