Clean up DummySocket buffer management.

Author: Lukasa

test/test_http11.py

@@ -129,12 +129,12 @@ def test_iterable_header(self):
         c._sock = sock = DummySocket()
 
         c.request('GET', '/get', headers=(
-            ('User-Agent', 'hyper'), 
+            ('User-Agent', 'hyper'),
             ('Custom-field', 'test'),
             ('Custom-field2', 'test'),
             ('Custom-field', 'test2'),
         ))
-        
+
         expected = (
             b"GET /get HTTP/1.1\r\n"
             b"User-Agent: hyper\r\n"
@@ -774,13 +774,16 @@ class DummySocket(object):
     def __init__(self):
         self.queue = []
         self._buffer = BytesIO()
+        self._read_counter = 0
         self.can_read = False
 
     @property
     def buffer(self):
-        return memoryview(self._buffer.getvalue())
+        return memoryview(self._buffer.getvalue()[self._read_counter:])
 
     def advance_buffer(self, amt):
+        print "advance buffer %d" % amt
+        self._read_counter += amt
         self._buffer.read(amt)
 
     def send(self, data):
@@ -790,13 +793,17 @@ def send(self, data):
         self.queue.append(data)
 
     def recv(self, l):
-        return memoryview(self._buffer.read(l))
+        data = self._buffer.read(l)
+        self._read_counter += len(data)
+        return memoryview(data)
 
     def close(self):
         pass
 
     def readline(self):
-        return memoryview(self._buffer.readline())
+        line = self._buffer.readline()
+        self._read_counter += len(line)
+        return memoryview(line)
 
     def fill(self):
         pass
@@ -817,4 +824,3 @@ def readline(self):
 
     def __iter__(self):
         return self.buffer.__iter__()
-

test/test_hyper.py

@@ -960,14 +960,17 @@ def buffer(self, value):
 
     def advance_buffer(self, amt):
         self._read_counter += amt
+        self._buffer.read(amt)
 
     def send(self, data):
         self.queue.append(data)
 
     sendall = send
 
     def recv(self, l):
-        return memoryview(self.buffer.read(l))
+        data = self._buffer.read(l)
+        self._read_counter += len(data)
+        return memoryview(data)
 
     def close(self):
         pass