diff options
author | Ned Deily <nad@acm.org> | 2014-02-03 21:58:31 (GMT) |
---|---|---|
committer | Ned Deily <nad@acm.org> | 2014-02-03 21:58:31 (GMT) |
commit | c5640385800ea75445824d7e8caf8386ded238dc (patch) | |
tree | a3a505ee0cc1dbc5bd6eb9224e2756bd9ae1d4d8 | |
parent | 160f8924ac53f330aa1cad5d63c1351cb844073e (diff) | |
download | cpython-c5640385800ea75445824d7e8caf8386ded238dc.zip cpython-c5640385800ea75445824d7e8caf8386ded238dc.tar.gz cpython-c5640385800ea75445824d7e8caf8386ded238dc.tar.bz2 |
Issue #20474: Fix "unexpected success" test_socket failures on OS X 10.7+.
-rw-r--r-- | Lib/test/test_socket.py | 8 | ||||
-rw-r--r-- | Misc/NEWS | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py index f696fe1..001712f 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]) @@ -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 ------------- |