Fix incorrect warning in StreamReader.

aio-libs · Sep 7, 2017 · 5fce093 · 5fce093
1 parent 60f3342
commit 5fce093
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 0 deletions.
diff --git a/aiohttp/streams.py b/aiohttp/streams.py
@@ -201,6 +201,7 @@ def unread_data(self, data):
             self._buffer_offset = 0
         self._size += len(data)
         self._buffer.appendleft(data)
+        self._eof_counter = 0
 
     def feed_data(self, data):
         assert not self._eof, 'feed_data after feed_eof'

diff --git a/changes/dummy.bugfix b/changes/dummy.bugfix
@@ -0,0 +1 @@
+Fix incorrect warning in StreamReader.
diff --git a/tests/test_streams.py b/tests/test_streams.py
@@ -181,6 +181,22 @@ def test_read_eof_infinit(self, internal_logger):
         self.loop.run_until_complete(stream.read())
         self.assertTrue(internal_logger.warning.called)
 
+    @mock.patch('aiohttp.streams.internal_logger')
+    def test_read_eof_unread_data_no_warning(self, internal_logger):
+        # Read bytes.
+        stream = self._make_one()
+        stream.feed_eof()
+
+        self.loop.run_until_complete(stream.read())
+        self.loop.run_until_complete(stream.read())
+        self.loop.run_until_complete(stream.read())
+        self.loop.run_until_complete(stream.read())
+        self.loop.run_until_complete(stream.read())
+        stream.unread_data(b'data')
+        self.loop.run_until_complete(stream.read())
+        self.loop.run_until_complete(stream.read())
+        self.assertFalse(internal_logger.warning.called)
+
     def test_read_until_eof(self):
         # Read all bytes until eof.
         stream = self._make_one()