From: Ned Deily Date: Mon, 3 Feb 2014 21:58:31 +0000 (-0800) Subject: Issue #20474: Fix "unexpected success" test_socket failures on OS X 10.7+. X-Git-Tag: v3.4.0rc1~100^2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c5640385800ea75445824d7e8caf8386ded238dc;p=thirdparty%2FPython%2Fcpython.git Issue #20474: Fix "unexpected success" test_socket failures on OS X 10.7+. --- diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py index f696fe17cd2a..001712f57e99 100644 --- a/Lib/test/test_socket.py +++ b/Lib/test/test_socket.py @@ -3490,12 +3490,12 @@ class InterruptedSendTimeoutTest(InterruptedTimeoutBase, self.assertNotIsInstance(cm.exception, socket.timeout) self.assertEqual(cm.exception.errno, errno.EINTR) - # Issue #12958: The following tests have problems on Mac OS X - @support.anticipate_failure(sys.platform == "darwin") + # Issue #12958: The following tests have problems on OS X prior to 10.7 + @support.requires_mac_ver(10, 7) def testInterruptedSendTimeout(self): self.checkInterruptedSend(self.serv_conn.send, b"a"*512) - @support.anticipate_failure(sys.platform == "darwin") + @support.requires_mac_ver(10, 7) def testInterruptedSendtoTimeout(self): # Passing an actual address here as Python's wrapper for # sendto() doesn't allow passing a zero-length one; POSIX @@ -3504,7 +3504,7 @@ class InterruptedSendTimeoutTest(InterruptedTimeoutBase, self.checkInterruptedSend(self.serv_conn.sendto, b"a"*512, self.serv_addr) - @support.anticipate_failure(sys.platform == "darwin") + @support.requires_mac_ver(10, 7) @requireAttrs(socket.socket, "sendmsg") def testInterruptedSendmsgTimeout(self): self.checkInterruptedSend(self.serv_conn.sendmsg, [b"a"*512]) diff --git a/Misc/NEWS b/Misc/NEWS index 3c078bde2a63..953ceed575a0 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -365,6 +365,8 @@ Tests - Issue #19085: Added basic tests for all tkinter widget options. +- Issue #20474: Fix test_socket "unexpected success" failures on OS X 10.7+. + Documentation -------------