summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2014-01-14 05:29:03 (GMT)
committerBenjamin Peterson <benjamin@python.org>2014-01-14 05:29:03 (GMT)
commit60ea92883f87ff7eb18f6eacd354e86c28c8d910 (patch)
tree8b4e539d047bfa6b734d2ef851b30abc53dc9ed3
parent901acb4d897a2a87554a5355f9cd30dd3e0ce422 (diff)
parentbd1d12e61b1670b6a48ca2d3b06834f8929d70b2 (diff)
downloadcpython-60ea92883f87ff7eb18f6eacd354e86c28c8d910.zip
cpython-60ea92883f87ff7eb18f6eacd354e86c28c8d910.tar.gz
cpython-60ea92883f87ff7eb18f6eacd354e86c28c8d910.tar.bz2
merge 3.3
-rw-r--r--Lib/test/test_socket.py7
1 files changed, 7 insertions, 0 deletions
diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
index cce412a..14e7e15 100644
--- a/Lib/test/test_socket.py
+++ b/Lib/test/test_socket.py
@@ -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