diracx-testing 0.0.1a24__py3-none-any.whl → 0.0.1a26__py3-none-any.whl

diracx/testing/mock_osdb.py

@@ -72,18 +72,22 @@ class MockOSDBMixin:
             yield
 
     async def __aenter__(self):
-        await self._sql_db.__aenter__()
+        """Enter the request context.
+
+        This is a no-op as the real OpenSearch class doesn't use transactions.
+        Instead we enter a transaction in each method that needs it.
+        """
         return self
 
     async def __aexit__(self, exc_type, exc_value, traceback):
-        await self._sql_db.__aexit__(exc_type, exc_value, traceback)
+        pass
 
     async def create_index_template(self) -> None:
         async with self._sql_db.engine.begin() as conn:
             await conn.run_sync(self._sql_db.metadata.create_all)
 
     async def upsert(self, doc_id, document) -> None:
-        async with self:
+        async with self._sql_db:
             values = {}
             for key, value in document.items():
                 if key in self.fields:
@@ -106,7 +110,7 @@ class MockOSDBMixin:
         per_page: int = 100,
         page: int | None = None,
     ) -> tuple[int, list[dict[Any, Any]]]:
-        async with self:
+        async with self._sql_db:
             # Apply selection
             if parameters:
                 columns = []
@@ -150,7 +154,8 @@ class MockOSDBMixin:
         return results
 
     async def ping(self):
-        return await self._sql_db.ping()
+        async with self._sql_db:
+            return await self._sql_db.ping()
 
 
 def fake_available_osdb_implementations(name, *, real_available_implementations):

diracx/testing/utils.py

@@ -18,8 +18,8 @@ from typing import TYPE_CHECKING, Generator
 from urllib.parse import parse_qs, urljoin, urlparse
 from uuid import uuid4
 
+import httpx
 import pytest
-import requests
 
 if TYPE_CHECKING:
     from diracx.core.settings import DevelopmentSettings
@@ -252,6 +252,7 @@ class ClientFactory:
         assert (
             self.app.dependency_overrides == {} and self.app.lifetime_functions == []
         ), "configure cannot be nested"
+
         for k, v in self.all_dependency_overrides.items():
 
             class_name = k.__self__.__name__
@@ -284,17 +285,26 @@ class ClientFactory:
         import sqlalchemy
         from sqlalchemy.util.concurrency import greenlet_spawn
 
+        from diracx.db.os.utils import BaseOSDB
         from diracx.db.sql.utils import BaseSQLDB
+        from diracx.testing.mock_osdb import MockOSDBMixin
 
         for k, v in self.app.dependency_overrides.items():
-            # Ignore dependency overrides which aren't BaseSQLDB.transaction
-            if (
-                isinstance(v, UnavailableDependency)
-                or k.__func__ != BaseSQLDB.transaction.__func__
+            # Ignore dependency overrides which aren't BaseSQLDB.transaction or BaseOSDB.session
+            if isinstance(v, UnavailableDependency) or k.__func__ not in (
+                BaseSQLDB.transaction.__func__,
+                BaseOSDB.session.__func__,
             ):
+
                 continue
+
             # The first argument of the overridden BaseSQLDB.transaction is the DB object
             db = v.args[0]
+            # We expect the OS DB to be mocked with sqlite, so use the
+            # internal DB
+            if isinstance(db, MockOSDBMixin):
+                db = db._sql_db
+
             assert isinstance(db, BaseSQLDB), (k, db)
 
             # set PRAGMA foreign_keys=ON if sqlite
@@ -606,7 +616,7 @@ async def test_login(monkeypatch, capfd, cli_env):
 
     poll_attempts = 0
 
-    def fake_sleep(*args, **kwargs):
+    async def fake_sleep(*args, **kwargs):
         nonlocal poll_attempts
 
         # Keep track of the number of times this is called
@@ -619,13 +629,13 @@ async def test_login(monkeypatch, capfd, cli_env):
             match = re.search(rf"{cli_env['DIRACX_URL']}[^\n]+", captured.out)
             assert match, captured
 
-            do_device_flow_with_dex(match.group(), cli_env["DIRACX_CA_PATH"])
+            await do_device_flow_with_dex(match.group(), cli_env["DIRACX_CA_PATH"])
 
         # Ensure we don't poll forever
         assert poll_attempts <= 100
 
         # Reduce the sleep duration to zero to speed up the test
-        return unpatched_sleep(0)
+        await unpatched_sleep(0.0)
 
     # We monkeypatch asyncio.sleep to provide a hook to run the actions that
     # would normally be done by a user. This includes capturing the login URL
@@ -640,7 +650,7 @@ async def test_login(monkeypatch, capfd, cli_env):
 
     # Run the login command
     with monkeypatch.context() as m:
-        m.setattr("asyncio.sleep", fake_sleep)
+        m.setattr("diracx.cli.auth.sleep", fake_sleep)
         await cli.auth.login(vo="diracAdmin", group=None, property=None)
     captured = capfd.readouterr()
     assert "Login successful!" in captured.out
@@ -654,7 +664,7 @@ async def test_login(monkeypatch, capfd, cli_env):
     return expected_credentials_path.read_text()
 
 
-def do_device_flow_with_dex(url: str, ca_path: str) -> None:
+async def do_device_flow_with_dex(url: str, ca_path: str) -> None:
     """Do the device flow with dex."""
 
     class DexLoginFormParser(HTMLParser):
@@ -662,10 +672,14 @@ def do_device_flow_with_dex(url: str, ca_path: str) -> None:
             nonlocal action_url
             if "form" in str(tag):
                 assert action_url is None
-                action_url = urljoin(login_page_url, dict(attrs)["action"])
+                action_url = urljoin(str(login_page_url), dict(attrs)["action"])
 
+    ssl_context = ssl.create_default_context(cafile=ca_path)
+    client_kwargs = dict(verify=ssl_context, follow_redirects=True)
     # Get the login page
-    r = requests.get(url, verify=ca_path)
+    async with httpx.AsyncClient(**client_kwargs) as client:
+        r = await client.get(url)
+
     r.raise_for_status()
     login_page_url = r.url  # This is not the same as URL as we redirect to dex
     login_page_body = r.text
@@ -676,19 +690,24 @@ def do_device_flow_with_dex(url: str, ca_path: str) -> None:
     assert action_url is not None, login_page_body
 
     # Do the actual login
-    r = requests.post(
-        action_url,
-        data={"login": "admin@example.com", "password": "password"},
-        verify=ca_path,
-    )
+    async with httpx.AsyncClient(**client_kwargs) as client:
+        r = await client.post(
+            action_url,
+            data={"login": "admin@example.com", "password": "password"},
+        )
+
     r.raise_for_status()
     approval_url = r.url  # This is not the same as URL as we redirect to dex
     # Do the actual approval
-    r = requests.post(
-        approval_url,
-        {"approval": "approve", "req": parse_qs(urlparse(r.url).query)["req"][0]},
-        verify=ca_path,
-    )
+
+    async with httpx.AsyncClient(**client_kwargs) as client:
+        r = await client.post(
+            approval_url,
+            data={
+                "approval": "approve",
+                "req": parse_qs(urlparse(str(r.url)).query)["req"][0],
+            },
+        )
 
     # This should have redirected to the DiracX page that shows the login is complete
     assert "Please close the window" in r.text

{diracx_testing-0.0.1a24.dist-info → diracx_testing-0.0.1a26.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: diracx-testing
-Version: 0.0.1a24
+Version: 0.0.1a26
 Summary: TODO
 License: GPL-3.0-only
 Classifier: Intended Audience :: Science/Research
@@ -14,5 +14,6 @@ Requires-Dist: pytest
 Requires-Dist: pytest-asyncio
 Requires-Dist: pytest-cov
 Requires-Dist: pytest-xdist
+Requires-Dist: httpx
 Provides-Extra: testing
 Requires-Dist: diracx-testing; extra == "testing"

{diracx_testing-0.0.1a24.dist-info → diracx_testing-0.0.1a26.dist-info}/RECORD

@@ -1,11 +1,11 @@
 diracx/testing/__init__.py,sha256=nGbnGP8m53N9rqHR-hyqDa5vetcsmnQp806HadV6_dE,984
 diracx/testing/dummy_osdb.py,sha256=bNk3LF8KgMuQx3RVFNYuw4hMmpG2A80sZ58rEZqHo7M,907
 diracx/testing/entrypoints.py,sha256=MbH0VLUQz96XPdHzb7XWFwYtWEitAqPrrGM1H1FzDLo,2231
-diracx/testing/mock_osdb.py,sha256=SCpiC0HnsBL2UZMrmybG060A2jvlhDXNcLQ4KgdCSQ4,5873
+diracx/testing/mock_osdb.py,sha256=hHuvmQZ3212SaSGX11dQv4ki3ZWsmqJZFYwdn6kg2MA,6029
 diracx/testing/osdb.py,sha256=m6mUBLnGOoQLTCIBie9P2GhmLMybrgzIrlIYfhF1_Ss,3230
 diracx/testing/routers.py,sha256=UW-TnikMQgcNxF5sUZD5DWoucGiCpP6s8mYmuahDiSc,979
-diracx/testing/utils.py,sha256=5NRQhWre34dIhhTccBI1IICz2lPdxvEpbpq4jb_wKZw,23694
-diracx_testing-0.0.1a24.dist-info/METADATA,sha256=MYbR38ttL5UcXNqhmh0Q-8fWlnhqWDVXH1k9ImIfpTI,613
-diracx_testing-0.0.1a24.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-diracx_testing-0.0.1a24.dist-info/top_level.txt,sha256=vJx10tdRlBX3rF2Psgk5jlwVGZNcL3m_7iQWwgPXt-U,7
-diracx_testing-0.0.1a24.dist-info/RECORD,,
+diracx/testing/utils.py,sha256=uPI7UssaOkDvaG3Lq1-A-IJCYvhQ1F_HcQsI6N6O-Bw,24417
+diracx_testing-0.0.1a26.dist-info/METADATA,sha256=Cye4WM98UB1L1irFN3KHkgq4Iqd74Gxi-Ej8U-kc9fw,634
+diracx_testing-0.0.1a26.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+diracx_testing-0.0.1a26.dist-info/top_level.txt,sha256=vJx10tdRlBX3rF2Psgk5jlwVGZNcL3m_7iQWwgPXt-U,7
+diracx_testing-0.0.1a26.dist-info/RECORD,,