Add test to make sure we send connection close when client sends it (#1776)

Author: Kludex

tests/protocols/test_http.py

@@ -35,6 +35,10 @@
     ]
 )
 
+CONNECTION_CLOSE_REQUEST = b"\r\n".join(
+    [b"GET / HTTP/1.1", b"Host: example.org", b"Connection: close", b"", b""]
+)
+
 LARGE_POST_REQUEST = b"\r\n".join(
     [
         b"POST / HTTP/1.1",
@@ -936,3 +940,29 @@ async def test_huge_headers_h11_max_incomplete():
     await protocol.loop.run_one()
     assert b"HTTP/1.1 200 OK" in protocol.transport.buffer
     assert b"Hello, world" in protocol.transport.buffer
+
+
+@pytest.mark.anyio
+@pytest.mark.parametrize(
+    "protocol_cls,close_header",
+    (
+        pytest.param(
+            HttpToolsProtocol,
+            b"connection: close",
+            marks=pytest.mark.skipif(
+                HttpToolsProtocol is None, reason="httptools is not installed"
+            ),
+        ),
+        (H11Protocol, b"Connection: close"),
+    ),
+)
+async def test_return_close_header(protocol_cls, close_header: bytes):
+    app = Response("Hello, world", media_type="text/plain")
+
+    protocol = get_connected_protocol(app, protocol_cls)
+    protocol.data_received(CONNECTION_CLOSE_REQUEST)
+    await protocol.loop.run_one()
+    assert b"HTTP/1.1 200 OK" in protocol.transport.buffer
+    assert b"content-type: text/plain" in protocol.transport.buffer
+    assert b"content-length: 12" in protocol.transport.buffer
+    assert close_header in protocol.transport.buffer

tests/test_main.py

@@ -16,21 +16,6 @@ async def app(scope, receive, send):
     await send({"type": "http.response.body", "body": b"", "more_body": False})
 
 
-@pytest.mark.anyio
-async def test_return_close_header():
-    config = Config(app=app, host="localhost", loop="asyncio", limit_max_requests=1)
-    async with run_server(config):
-        async with httpx.AsyncClient() as client:
-            response = await client.get(
-                "http://127.0.0.1:8000", headers={"connection": "close"}
-            )
-
-    assert response.status_code == 204
-    assert (
-        "connection" in response.headers and response.headers["connection"] == "close"
-    )
-
-
 def _has_ipv6(host):
     sock = None
     has_ipv6 = False