merge 3.3

This commit is contained in:
Benjamin Peterson 2014-01-14 00:29:03 -05:00
commit 60ea92883f
1 changed files with 7 additions and 0 deletions

View File

@ -4691,6 +4691,13 @@ class BufferIOTest(SocketConnectedTest):
def _testRecvFromIntoSmallBuffer(self):
self.serv_conn.send(MSG*2048)
def testRecvFromIntoEmptyBuffer(self):
buf = bytearray()
self.cli_conn.recvfrom_into(buf)
self.cli_conn.recvfrom_into(buf, 0)
_testRecvFromIntoEmptyBuffer = _testRecvFromIntoArray
TIPC_STYPE = 2000
TIPC_LOWER = 200