Update MockRouter for new pytest-httpx release

Author: TheByronHimes

src/ghga_service_commons/api/mock_router.py

@@ -23,16 +23,11 @@
 from typing import Any, Callable, Generic, TypeVar, cast, get_type_hints
 
 import httpx
-import pytest
 from pydantic import BaseModel
 
 from ghga_service_commons.httpyexpect.server.exceptions import HttpException
 
-__all__ = [
-    "MockRouter",
-    "assert_all_responses_were_requested",
-    "HttpException",
-]
+__all__ = ["MockRouter", "HttpException"]
 
 BRACKET_PATTERN = re.compile(r"{.*?}")
 
@@ -67,17 +62,6 @@ def _get_signature_info(endpoint_function: Callable) -> dict[str, Any]:
     return signature_parameters
 
 
-@pytest.fixture
-def assert_all_responses_were_requested() -> bool:
-    """Whether httpx checks that all registered responses are sent back.
-
-    This is set to false because the registered endpoints are considered mocked even if
-    they aren't used in a given test. If this is True (default), pytest_httpx will raise
-    an error if a given test doesn't hit every mocked endpoint.
-    """
-    return False
-
-
 class RegisteredEndpoint(BaseModel):
     """Endpoint data with the url turned into regex string to get parameters in path."""
 

tests/integration/test_mock_router.py

@@ -23,10 +23,7 @@
 from fastapi import HTTPException
 from pytest_httpx import HTTPXMock, httpx_mock  # noqa: F401
 
-from ghga_service_commons.api.mock_router import (  # noqa: F401
-    MockRouter,
-    assert_all_responses_were_requested,
-)
+from ghga_service_commons.api.mock_router import MockRouter
 from ghga_service_commons.httpyexpect.server.exceptions import HttpException
 from tests.integration.fixtures.mock_api import app
 
@@ -85,7 +82,8 @@ def test_get_two_path_variables(httpx_mock: HTTPXMock):  # noqa: F811
     """Make sure the handler can parse paths with more than one variable."""
     httpx_mock.add_callback(callback=app.handle_request)
 
-    expected = ["4", 9]  # pass str number as a sanity check that it stays a str
+    # pass str number as a sanity check that it stays a str
+    expected = ["4", 9]
 
     with httpx.Client(base_url=BASE_URL) as client:
         response = client.get(f"/items/{expected[0]}/sizes/{expected[1]}")
@@ -186,6 +184,9 @@ def dummy(parameter1) -> None:
             """Define a dummy function with missing type-hint info."""
 
 
+@pytest.mark.httpx_mock(
+    assert_all_responses_were_requested=False, can_send_already_matched_responses=True
+)
 def test_handler_errors_filtering(httpx_mock: HTTPXMock):  # noqa: F811
     """Make sure only the specified errors are passed to the handler.