Migrate from aioresponses to aiointercept

Author: leplatrem

pyproject.toml

@@ -25,7 +25,7 @@ description = ""
 [dependency-groups]
 dev = [
     "pytest>=9.0.3,<10.0.0",
-    "aioresponses<1.0.0,>=0.7.8",
+    "aiointercept>=0.1.7",
     "pytest-aiohttp<2.0.0,>=1.1.0",
     "pytest-cov>=6.2.1,<8.0.0",
     "bandit<2.0.0,>=1.8.6",

telescope/utils.py

@@ -324,7 +324,7 @@ async def fetch_head(url: str, **kwargs) -> Tuple[int, Dict[str, str]]:
     logger.debug(f"Fetch HEAD from '{human_url}'")
     async with ClientSession() as session:
         async with session.head(url, **kwargs) as response:
-            return response.status, dict(response.headers)
+            return response.status, CIMultiDict(response.headers)
 
 
 @limit_request_concurrency

tests/checks/core/test_heartbeat.py

@@ -26,7 +26,7 @@ async def test_unreachable(mock_aioresponses, config):
     status, data = await run("http://not-mocked")
 
     assert status is False
-    assert data == "Connection refused: GET http://not-mocked"
+    assert data == "Server disconnected"
 
 
 async def test_xml_response(mock_aioresponses):

tests/checks/core/test_latency.py

@@ -1,7 +1,7 @@
 import time
 
 import aiohttp
-from aioresponses import CallbackResult
+from aiointercept import CallbackResult
 
 from checks.core.latency import run
 
@@ -44,4 +44,4 @@ async def test_unreachable(mock_aioresponses, no_sleep):
     status, data = await run("http://not-mocked", max_milliseconds=10)
 
     assert status is False
-    assert "Connection refused" in data
+    assert "Server disconnected" in data

tests/checks/remotesettings/test_attachments_integrity.py

@@ -113,7 +113,7 @@ async def test_negative(mock_aioresponses, no_sleep):
     assert data == {
         "bad": [
             {
-                "error": "timeout",
+                "error": "Server disconnected",
                 "url": "http://cdn/file3.jpg",
             },
             {
@@ -125,7 +125,7 @@ async def test_negative(mock_aioresponses, no_sleep):
                 "url": "http://cdn/file1.jpg",
             },
             {
-                "error": "Connection refused: GET http://cdn/missing.jpg",
+                "error": "Server disconnected",
                 "url": "http://cdn/missing.jpg",
             },
         ],

tests/checks/remotesettings/test_collections_consistency.py

@@ -226,7 +226,7 @@ async def test_fails_if_source_collection_missing_in_monitored_changes(
     monitor_changes_url = (
         server_url
         + CHANGESET_URL.format("monitor", "changes")
-        + "?_expected=0&_sort=bucket%252Ccollection"
+        + "?_expected=0&_sort=bucket,collection"
     )
     mock_aioresponses.get(
         monitor_changes_url,

tests/checks/remotesettings/test_utils.py

@@ -160,6 +160,6 @@ async def test_get_monitor_changes(mock_aioresponses):
         mock_aioresponses.requests.items()
     )
 
-    assert request1.kwargs["params"]["_expected"] == 0
-    assert "_expected" in request2.kwargs["params"]
-    assert request3.kwargs["params"]["_expected"] == "bim"
+    assert request1.kwargs["query"]["_expected"] == ["0"]
+    assert "_expected" in request2.kwargs["query"]
+    assert request3.kwargs["query"]["_expected"] == ["bim"]

tests/conftest.py

@@ -4,7 +4,7 @@
 from urllib.parse import urlsplit, urlunsplit
 
 import pytest
-from aioresponses import aioresponses
+from aiointercept import aiointercept
 
 from telescope import config as global_config
 from telescope import utils
@@ -61,10 +61,10 @@ async def config():
 
 
 @pytest.fixture
-def mock_aioresponses(cli):
+async def mock_aioresponses(cli):
     test_server = f"http://{cli.host}:{cli.port}"
-    with aioresponses(passthrough=[test_server]) as m:
-        # `aioresponses` matches URLs including query parameters.
+    async with aiointercept(mock_external_urls=True, passthrough=[test_server]) as m:
+        # `aiointercept` matches URLs including query parameters.
         # This monkeypatch makes it ignore them, so that a mock at
         # `/endpoint` will match a request done at `/endpoint?param=value`.
         original_add = m.add
@@ -75,8 +75,9 @@ def new_add(url, *args, **kwargs):
                 scheme, netloc, path, query, _ = urlsplit(url)
                 if not query:
                     base_url = urlunsplit((scheme, netloc, path, "", ""))
-                    # ^base(?:\?.*)?$  → base, optionally followed by ?...
-                    url = re.compile(re.escape(base_url) + r"(?:\?.*)?$")
+                    # ^base/?(?:\?.*)?$  → base, optional trailing slash,
+                    # optionally followed by ?...
+                    url = re.compile(re.escape(base_url) + r"/?(?:\?.*)?$")
             return original_add(url, *args, **kwargs)
 
         m.add = new_add  # ty: ignore[invalid-assignment]

tests/test_basic_endpoints.py

@@ -5,7 +5,7 @@
 from operator import itemgetter
 from unittest import mock
 
-from aioresponses import CallbackResult
+from aiointercept import CallbackResult
 
 from telescope import config
 from telescope.utils import run_parallel
@@ -234,11 +234,10 @@ async def test_check_run_bad_value(cli):
 async def test_check_positive(cli, mock_aioresponses):
     def slow_down(url, **kwargs):
         time.sleep(0.01)
+        return CallbackResult(status=200, payload={"ok": True})
 
     mock_aioresponses.get(
         "http://server.local/__heartbeat__",
-        status=200,
-        payload={"ok": True},
         callback=slow_down,
     )