Fix tests

tests/helpers/test_aiohttp_client.py

@@ -135,18 +135,16 @@ def test_get_clientsession_cleanup_without_ssl(self):
 @asyncio.coroutine
 def test_async_aiohttp_proxy_stream(aioclient_mock, camera_client):
     """Test that it fetches the given url."""
-    aioclient_mock.get('http://example.com/mjpeg_stream', content=[
-        b'Frame1', b'Frame2', b'Frame3'
-    ])
+    aioclient_mock.get('http://example.com/mjpeg_stream',
+                       content=b'Frame1Frame2Frame3')
 
     resp = yield from camera_client.get(
         '/api/camera_proxy_stream/camera.config_test')
 
     assert resp.status == 200
     assert aioclient_mock.call_count == 1
     body = yield from resp.text()
-    assert body == 'Frame3Frame2Frame1'
-
+    assert body == 'Frame1Frame2Frame3'
 
 @asyncio.coroutine
 def test_async_aiohttp_proxy_stream_timeout(aioclient_mock, camera_client):

tests/test_util/aiohttp.py

@@ -15,7 +15,8 @@
 retype = type(re.compile(''))
 
 
-def create_stream(data):
+def mock_stream(data):
+    """Mock a stream with data."""
     protocol = mock.Mock(_reading_paused=False)
     stream = StreamReader(protocol)
     stream.feed_data(data)
@@ -139,18 +140,6 @@ def __init__(self, method, url, status, response, cookies=None, exc=None,
                 cookie.value = data
                 self._cookies[name] = cookie
 
-        if isinstance(response, list):
-            self.content = mock.MagicMock()
-
-            @asyncio.coroutine
-            def read(*argc, **kwargs):
-                """Read content stream mock."""
-                if self.response:
-                    return self.response.pop()
-                return None
-
-            self.content.read = read
-
     def match_request(self, method, url, params=None):
         """Test if response answers request."""
         if method.lower() != self.method.lower():
@@ -189,7 +178,7 @@ def cookies(self):
     @property
     def content(self):
         """Return content."""
-        return create_stream(self.response)
+        return mock_stream(self.response)
 
     @asyncio.coroutine
     def read(self):