make the buffered socket buffer reads too

Author: tomato42

tlslite/bufferedsocket.py

@@ -25,6 +25,7 @@ def __init__(self, socket):
         self.socket = socket
         self._write_queue = deque()
         self.buffer_writes = False
+        self._read_buffer = bytearray()
 
     def send(self, data):
         """Send data to the socket"""
@@ -51,7 +52,11 @@ def flush(self):
 
     def recv(self, bufsize):
         """Receive data from socket (socket emulation)"""
-        return self.socket.recv(bufsize)
+        if not self._read_buffer:
+            self._read_buffer += self.socket.recv(max(4096, bufsize))
+        ret = self._read_buffer[:bufsize]
+        del self._read_buffer[:bufsize]
+        return ret
 
     def getsockname(self):
         """Return the socket's own address (socket emulation)."""

unit_tests/test_tlslite_bufferedsocket.py

@@ -89,11 +89,9 @@ def test_flush_with_data_and_multiple_messages(self):
         self.raw_sock.sendall.assert_called_once_with(bytearray(b'abcdefg'))
 
     def test_recv(self):
-        value = mock.Mock()
-        ret = self.sock.recv(value)
+        ret = self.sock.recv(10)
 
-        self.raw_sock.recv.assert_called_once_with(value)
-        self.assertIs(ret, self.raw_sock.recv.return_value)
+        self.raw_sock.recv.assert_called_once_with(4096)
 
     def test_getsockname(self):
         ret = self.sock.getsockname()