mirror of
https://github.com/python/cpython.git
synced 2025-10-10 00:43:41 +00:00
Issue #20474: Fix "unexpected success" test_socket failures on OS X 10.7+.
This commit is contained in:
commit
cb306d1b59
2 changed files with 6 additions and 4 deletions
|
@ -3635,12 +3635,12 @@ class InterruptedSendTimeoutTest(InterruptedTimeoutBase,
|
||||||
self.assertNotIsInstance(cm.exception, socket.timeout)
|
self.assertNotIsInstance(cm.exception, socket.timeout)
|
||||||
self.assertEqual(cm.exception.errno, errno.EINTR)
|
self.assertEqual(cm.exception.errno, errno.EINTR)
|
||||||
|
|
||||||
# Issue #12958: The following tests have problems on Mac OS X
|
# Issue #12958: The following tests have problems on OS X prior to 10.7
|
||||||
@support.anticipate_failure(sys.platform == "darwin")
|
@support.requires_mac_ver(10, 7)
|
||||||
def testInterruptedSendTimeout(self):
|
def testInterruptedSendTimeout(self):
|
||||||
self.checkInterruptedSend(self.serv_conn.send, b"a"*512)
|
self.checkInterruptedSend(self.serv_conn.send, b"a"*512)
|
||||||
|
|
||||||
@support.anticipate_failure(sys.platform == "darwin")
|
@support.requires_mac_ver(10, 7)
|
||||||
def testInterruptedSendtoTimeout(self):
|
def testInterruptedSendtoTimeout(self):
|
||||||
# Passing an actual address here as Python's wrapper for
|
# Passing an actual address here as Python's wrapper for
|
||||||
# sendto() doesn't allow passing a zero-length one; POSIX
|
# 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.checkInterruptedSend(self.serv_conn.sendto, b"a"*512,
|
||||||
self.serv_addr)
|
self.serv_addr)
|
||||||
|
|
||||||
@support.anticipate_failure(sys.platform == "darwin")
|
@support.requires_mac_ver(10, 7)
|
||||||
@requireAttrs(socket.socket, "sendmsg")
|
@requireAttrs(socket.socket, "sendmsg")
|
||||||
def testInterruptedSendmsgTimeout(self):
|
def testInterruptedSendmsgTimeout(self):
|
||||||
self.checkInterruptedSend(self.serv_conn.sendmsg, [b"a"*512])
|
self.checkInterruptedSend(self.serv_conn.sendmsg, [b"a"*512])
|
||||||
|
|
|
@ -106,6 +106,8 @@ Tests
|
||||||
- Issue #19990: Added tests for the imghdr module. Based on patch by
|
- Issue #19990: Added tests for the imghdr module. Based on patch by
|
||||||
Claudiu Popa.
|
Claudiu Popa.
|
||||||
|
|
||||||
|
- Issue #20474: Fix test_socket "unexpected success" failures on OS X 10.7+.
|
||||||
|
|
||||||
Tools/Demos
|
Tools/Demos
|
||||||
-----------
|
-----------
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue