summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Lib/test/test_socket.py8
-rw-r--r--Misc/NEWS2
2 files changed, 6 insertions, 4 deletions
diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
index 61362ad..3c5b5eb 100644
--- a/Lib/test/test_socket.py
+++ b/Lib/test/test_socket.py
@@ -3635,12 +3635,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
@@ -3649,7 +3649,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 20e1028..ff73d0b 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -106,6 +106,8 @@ Tests
- Issue #19990: Added tests for the imghdr module. Based on patch by
Claudiu Popa.
+- Issue #20474: Fix test_socket "unexpected success" failures on OS X 10.7+.
+
Tools/Demos
-----------