Replace pytest-asyncio marker by anyio

requirements-pypa.in

@@ -0,0 +1,3 @@
+pip
+setuptools
+wheel

requirements-pypa.txt

@@ -0,0 +1,20 @@
+#
+# This file is autogenerated by pip-compile with python 3.9
+# To update, run:
+#
+#    pip-compile --allow-unsafe --generate-hashes --output-file=requirements-pypa.txt requirements-pypa.in
+#
+wheel==0.37.0 \
+    --hash=sha256:21014b2bd93c6d0034b6ba5d35e4eb284340e09d63c59aef6fc14b0f346146fd \
+    --hash=sha256:e2ef7239991699e3355d54f8e968a21bb940a1dbf34a4d226741e64462516fad
+    # via -r requirements-pypa.in
+
+# The following packages are considered to be unsafe in a requirements file:
+pip==21.2.4 \
+    --hash=sha256:0eb8a1516c3d138ae8689c0c1a60fde7143310832f9dc77e11d8a4bc62de193b \
+    --hash=sha256:fa9ebb85d3fd607617c0c44aca302b1b45d87f9c2a1649b46c26167ca4296323
+    # via -r requirements-pypa.in
+setuptools==57.4.0 \
+    --hash=sha256:6bac238ffdf24e8806c61440e755192470352850f3419a52f26ffe0a1a64f465 \
+    --hash=sha256:a49230977aa6cfb9d933614d2f7b79036e9945c4cdd7583163f4e920b83418d6
+    # via -r requirements-pypa.in

requirements.txt

@@ -21,7 +21,6 @@ trustme
 cryptography
 coverage
 httpx>=0.18.2
-pytest-asyncio==0.14.*
 async_generator; python_version < '3.7'
 
 
@@ -31,3 +30,5 @@ mkdocs-material
 
 # py3.10 workarounds
 https://github.com/aaugustin/websockets/archive/4e1dac362a3639b9cf0e5bcf382601e6e32cfede.tar.gz#egg=websockets; python_version >= '3.10'
+
+anyio @ git+https://github.com/graingert/anyio.git@b907c72ffae4e89c09fc9d7d81ff8c45fee43ccd

scripts/install

@@ -10,9 +10,10 @@ set -x
 
 if [ -z "$GITHUB_ACTIONS" ]; then
     "$PYTHON" -m venv "$VENV"
-    PIP="$VENV/bin/pip"
+    PIP="$VENV/bin/python -m pip"
 else
-    PIP="pip"
+    PIP="$PYTHON -m pip"
 fi
 
-"$PIP" install -r "$REQUIREMENTS"
+$PIP install -r "requirements-pypa.txt"
+$PIP install -r "$REQUIREMENTS"

tests/conftest.py

@@ -1,4 +1,5 @@
 import ssl
+from typing import Dict, Tuple
 
 import pytest
 import trustme
@@ -128,3 +129,8 @@ def reload_directory_structure(tmp_path_factory: pytest.TempPathFactory):
     ext_file.touch()
 
     yield root
+
+
+@pytest.fixture
+def anyio_backend() -> Tuple[str, Dict[str, object]]:
+    return ("asyncio", {})

tests/middleware/test_debug.py

@@ -4,7 +4,7 @@
 from uvicorn.middleware.debug import DebugMiddleware
 
 
-@pytest.mark.asyncio
+@pytest.mark.anyio
 async def test_debug_text():
     async def app(scope, receive, send):
         raise RuntimeError("Something went wrong")
@@ -24,7 +24,7 @@ async def app(scope, receive, send):
     assert "RuntimeError" in response.text
 
 
-@pytest.mark.asyncio
+@pytest.mark.anyio
 async def test_debug_html():
     async def app(scope, receive, send):
         raise RuntimeError("Something went wrong")
@@ -43,7 +43,7 @@ async def app(scope, receive, send):
     assert "RuntimeError" in response.text
 
 
-@pytest.mark.asyncio
+@pytest.mark.anyio
 async def test_debug_after_response_sent():
     async def app(scope, receive, send):
         await send({"type": "http.response.start", "status": 204, "headers": []})
@@ -63,7 +63,7 @@ async def app(scope, receive, send):
     assert response.content == b""
 
 
-@pytest.mark.asyncio
+@pytest.mark.anyio
 async def test_debug_not_http():
     async def app(scope, send, receive):
         raise RuntimeError("Something went wrong")

tests/middleware/test_logging.py

@@ -27,7 +27,7 @@ async def app(scope, receive, send):
     await send({"type": "http.response.body", "body": b"", "more_body": False})
 
 
-@pytest.mark.asyncio
+@pytest.mark.anyio
 async def test_trace_logging(caplog):
     config = Config(app=app, log_level="trace")
     with caplog_for_logger(caplog, "uvicorn.asgi"):
@@ -46,7 +46,7 @@ async def test_trace_logging(caplog):
         assert "ASGI [2] Completed" in messages.pop(0)
 
 
-@pytest.mark.asyncio
+@pytest.mark.anyio
 @pytest.mark.parametrize("http_protocol", [("h11"), ("httptools")])
 async def test_trace_logging_on_http_protocol(http_protocol, caplog):
     config = Config(app=app, log_level="trace", http=http_protocol)
@@ -64,7 +64,7 @@ async def test_trace_logging_on_http_protocol(http_protocol, caplog):
         assert any(" - HTTP connection lost" in message for message in messages)
 
 
-@pytest.mark.asyncio
+@pytest.mark.anyio
 @pytest.mark.parametrize("ws_protocol", [("websockets"), ("wsproto")])
 async def test_trace_logging_on_ws_protocol(ws_protocol, caplog):
     async def websocket_app(scope, receive, send):
@@ -95,7 +95,7 @@ async def open_connection(url):
         assert any(" - WebSocket connection lost" in message for message in messages)
 
 
-@pytest.mark.asyncio
+@pytest.mark.anyio
 @pytest.mark.parametrize("use_colors", [(True), (False), (None)])
 async def test_access_logging(use_colors, caplog):
     config = Config(app=app, use_colors=use_colors)
@@ -113,7 +113,7 @@ async def test_access_logging(use_colors, caplog):
         assert '"GET / HTTP/1.1" 204' in messages.pop()
 
 
-@pytest.mark.asyncio
+@pytest.mark.anyio
 @pytest.mark.parametrize("use_colors", [(True), (False)])
 async def test_default_logging(use_colors, caplog):
     config = Config(app=app, use_colors=use_colors)
@@ -134,7 +134,7 @@ async def test_default_logging(use_colors, caplog):
         assert "Shutting down" in messages.pop(0)
 
 
-@pytest.mark.asyncio
+@pytest.mark.anyio
 async def test_unknown_status_code(caplog):
     async def app(scope, receive, send):
         assert scope["type"] == "http"

tests/middleware/test_message_logger.py

@@ -5,7 +5,7 @@
 from uvicorn.middleware.message_logger import MessageLoggerMiddleware
 
 
-@pytest.mark.asyncio
+@pytest.mark.anyio
 async def test_message_logger(caplog):
     async def app(scope, receive, send):
         await receive()
@@ -27,7 +27,7 @@ async def app(scope, receive, send):
     assert sum(["ASGI [1] Raised exception" in message for message in messages]) == 0
 
 
-@pytest.mark.asyncio
+@pytest.mark.anyio
 async def test_message_logger_exc(caplog):
     async def app(scope, receive, send):
         raise RuntimeError()

tests/middleware/test_proxy_headers.py

@@ -20,7 +20,7 @@ async def app(
     await response(scope, receive, send)
 
 
-@pytest.mark.asyncio
+@pytest.mark.anyio
 @pytest.mark.parametrize(
     ("trusted_hosts", "response_text"),
     [
@@ -50,7 +50,7 @@ async def test_proxy_headers_trusted_hosts(
     assert response.text == response_text
 
 
-@pytest.mark.asyncio
+@pytest.mark.anyio
 @pytest.mark.parametrize(
     ("trusted_hosts", "response_text"),
     [
@@ -87,7 +87,7 @@ async def test_proxy_headers_multiple_proxies(
     assert response.text == response_text
 
 
-@pytest.mark.asyncio
+@pytest.mark.anyio
 async def test_proxy_headers_invalid_x_forwarded_for() -> None:
     app_with_middleware = ProxyHeadersMiddleware(app, trusted_hosts="*")
     async with httpx.AsyncClient(

tests/middleware/test_wsgi.py

@@ -49,7 +49,7 @@ def return_exc_info(environ: Environ, start_response: StartResponse) -> List[byt
         return [output]
 
 
-@pytest.mark.asyncio
+@pytest.mark.anyio
 async def test_wsgi_get() -> None:
     app = WSGIMiddleware(hello_world)
     async with httpx.AsyncClient(app=app, base_url="http://testserver") as client:
@@ -58,7 +58,7 @@ async def test_wsgi_get() -> None:
     assert response.text == "Hello World!\n"
 
 
-@pytest.mark.asyncio
+@pytest.mark.anyio
 async def test_wsgi_post() -> None:
     app = WSGIMiddleware(echo_body)
     async with httpx.AsyncClient(app=app, base_url="http://testserver") as client:
@@ -67,7 +67,7 @@ async def test_wsgi_post() -> None:
     assert response.text == '{"example": 123}'
 
 
-@pytest.mark.asyncio
+@pytest.mark.anyio
 async def test_wsgi_exception() -> None:
     # Note that we're testing the WSGI app directly here.
     # The HTTP protocol implementations would catch this error and return 500.
@@ -77,7 +77,7 @@ async def test_wsgi_exception() -> None:
             await client.get("/")
 
 
-@pytest.mark.asyncio
+@pytest.mark.anyio
 async def test_wsgi_exc_info() -> None:
     # Note that we're testing the WSGI app directly here.
     # The HTTP protocol implementations would catch this error and return 500.

tests/protocols/test_http.py

@@ -185,6 +185,12 @@ def get_connected_protocol(app, protocol_cls, event_loop, **kwargs):
         asyncio._set_running_loop(None)
 
 
+@pytest.fixture
+def event_loop():
+    with contextlib.closing(asyncio.new_event_loop()) as loop:
+        yield loop
+
+
 @pytest.mark.parametrize("protocol_cls", HTTP_PROTOCOLS)
 def test_get_request(protocol_cls, event_loop):
     app = Response("Hello, world", media_type="text/plain")