Improve test

Author: MarkusSintonen

tests/_async/test_connection_pool.py

@@ -703,41 +703,60 @@ def get_extra_info(self, info: str) -> typing.Any:
                 return self.mock_is_readable
             return super().get_extra_info(info)  # pragma: nocover
 
+    streams = [
+        MockStream(
+            [
+                b"HTTP/1.1 200 OK\r\n",
+                b"Content-Type: plain/text\r\n",
+                b"Content-Length: 15\r\n",
+                b"\r\n",
+                b"Hello, world 1!",
+                b"HTTP/1.1 200 OK\r\n",
+                b"Content-Type: plain/text\r\n",
+                b"Content-Length: 15\r\n",
+                b"\r\n",
+                b"Hello, world 2!",
+            ]
+        ),
+        MockStream(
+            [
+                b"HTTP/1.1 200 OK\r\n",
+                b"Content-Type: plain/text\r\n",
+                b"Content-Length: 29\r\n",
+                b"\r\n",
+                b"Hello, world from new stream!",
+            ]
+        ),
+    ]
+
     class MockBackend(httpcore.AsyncMockBackend):
         async def connect_tcp(
             self, *args: typing.Any, **kwargs: typing.Any
         ) -> MockStream:
-            return MockStream(list(self._buffer))
+            return streams.pop(0)
 
-    network_backend = MockBackend(
-        [
-            b"HTTP/1.1 200 OK\r\n",
-            b"Content-Type: plain/text\r\n",
-            b"Content-Length: 13\r\n",
-            b"\r\n",
-            b"Hello, world!",
-            b"HTTP/1.1 200 OK\r\n",
-            b"Content-Type: plain/text\r\n",
-            b"Content-Length: 13\r\n",
-            b"\r\n",
-            b"Hello, world!",
-        ]
-    )
     async with httpcore.AsyncConnectionPool(
-        network_backend=network_backend, max_connections=1
+        network_backend=MockBackend([]), max_connections=1
     ) as pool:
-        await pool.request("GET", "https://example.com/")
+        res = await pool.request("GET", "https://example.com/")
+        assert (await res.aread()) == b"Hello, world 1!"
+
         assert len(pool.connections) == 1
         conn = pool.connections[0]
-        await pool.request("GET", "https://example.com/")
+
+        res = await pool.request("GET", "https://example.com/")
+        assert (await res.aread()) == b"Hello, world 2!"
+
         assert len(pool.connections) == 1
         assert conn is pool.connections[0], "Should reuse connection"
 
         # Simulate network breakage
         assert conn.is_idle()
         conn._connection._network_stream.mock_is_readable = True  # type: ignore[attr-defined]
 
-        await pool.request("GET", "https://example.com/")
+        res = await pool.request("GET", "https://example.com/")
+        assert (await res.aread()) == b"Hello, world from new stream!"
+
         assert len(pool.connections) == 1
         new_conn = pool.connections[0]
         assert new_conn is not conn, "Should be a new connection"

tests/_sync/test_connection_pool.py

@@ -703,41 +703,60 @@ def get_extra_info(self, info: str) -> typing.Any:
                 return self.mock_is_readable
             return super().get_extra_info(info)  # pragma: nocover
 
+    streams = [
+        MockStream(
+            [
+                b"HTTP/1.1 200 OK\r\n",
+                b"Content-Type: plain/text\r\n",
+                b"Content-Length: 15\r\n",
+                b"\r\n",
+                b"Hello, world 1!",
+                b"HTTP/1.1 200 OK\r\n",
+                b"Content-Type: plain/text\r\n",
+                b"Content-Length: 15\r\n",
+                b"\r\n",
+                b"Hello, world 2!",
+            ]
+        ),
+        MockStream(
+            [
+                b"HTTP/1.1 200 OK\r\n",
+                b"Content-Type: plain/text\r\n",
+                b"Content-Length: 29\r\n",
+                b"\r\n",
+                b"Hello, world from new stream!",
+            ]
+        ),
+    ]
+
     class MockBackend(httpcore.MockBackend):
         def connect_tcp(
             self, *args: typing.Any, **kwargs: typing.Any
         ) -> MockStream:
-            return MockStream(list(self._buffer))
+            return streams.pop(0)
 
-    network_backend = MockBackend(
-        [
-            b"HTTP/1.1 200 OK\r\n",
-            b"Content-Type: plain/text\r\n",
-            b"Content-Length: 13\r\n",
-            b"\r\n",
-            b"Hello, world!",
-            b"HTTP/1.1 200 OK\r\n",
-            b"Content-Type: plain/text\r\n",
-            b"Content-Length: 13\r\n",
-            b"\r\n",
-            b"Hello, world!",
-        ]
-    )
     with httpcore.ConnectionPool(
-        network_backend=network_backend, max_connections=1
+        network_backend=MockBackend([]), max_connections=1
     ) as pool:
-        pool.request("GET", "https://example.com/")
+        res = pool.request("GET", "https://example.com/")
+        assert (res.read()) == b"Hello, world 1!"
+
         assert len(pool.connections) == 1
         conn = pool.connections[0]
-        pool.request("GET", "https://example.com/")
+
+        res = pool.request("GET", "https://example.com/")
+        assert (res.read()) == b"Hello, world 2!"
+
         assert len(pool.connections) == 1
         assert conn is pool.connections[0], "Should reuse connection"
 
         # Simulate network breakage
         assert conn.is_idle()
         conn._connection._network_stream.mock_is_readable = True  # type: ignore[attr-defined]
 
-        pool.request("GET", "https://example.com/")
+        res = pool.request("GET", "https://example.com/")
+        assert (res.read()) == b"Hello, world from new stream!"
+
         assert len(pool.connections) == 1
         new_conn = pool.connections[0]
         assert new_conn is not conn, "Should be a new connection"