diracx-testing 0.0.1a27__py3-none-any.whl → 0.0.1a29__py3-none-any.whl

diracx/testing/utils.py

@@ -21,10 +21,15 @@ from uuid import uuid4
 import httpx
 import pytest
 
+from diracx.core.models import AccessTokenPayload, RefreshTokenPayload
+
 if TYPE_CHECKING:
-    from diracx.core.settings import DevelopmentSettings
-    from diracx.routers.jobs.sandboxes import SandboxStoreSettings
-    from diracx.routers.utils.users import AuthorizedUserInfo, AuthSettings
+    from diracx.core.settings import (
+        AuthSettings,
+        DevelopmentSettings,
+        SandboxStoreSettings,
+    )
+    from diracx.routers.utils.users import AuthorizedUserInfo
 
 
 # to get a string like this run:
@@ -92,9 +97,10 @@ def test_dev_settings() -> Generator[DevelopmentSettings, None, None]:
 def test_auth_settings(
     private_key_pem, fernet_key
 ) -> Generator[AuthSettings, None, None]:
-    from diracx.routers.utils.users import AuthSettings
+    from diracx.core.settings import AuthSettings
 
     yield AuthSettings(
+        token_issuer=ISSUER,
         token_algorithm="EdDSA",
         token_key=private_key_pem,
         state_key=fernet_key,
@@ -128,7 +134,7 @@ def aio_moto(worker_id):
 
 @pytest.fixture(scope="session")
 def test_sandbox_settings(aio_moto) -> SandboxStoreSettings:
-    from diracx.routers.jobs.sandboxes import SandboxStoreSettings
+    from diracx.core.settings import SandboxStoreSettings
 
     yield SandboxStoreSettings(
         bucket_name="sandboxes",
@@ -177,7 +183,9 @@ class ClientFactory:
                 pass
 
             @staticmethod
-            def enrich_tokens(access_payload: dict, refresh_payload: dict):
+            def enrich_tokens(
+                access_payload: AccessTokenPayload, refresh_payload: RefreshTokenPayload
+            ):
 
                 return {"PolicySpecific": "OpenAccessForTest"}, {}
 
@@ -186,13 +194,13 @@ class ClientFactory:
         }
         database_urls = {
             e.name: "sqlite+aiosqlite:///:memory:"
-            for e in select_from_extension(group="diracx.db.sql")
+            for e in select_from_extension(group="diracx.dbs.sql")
         }
         # TODO: Monkeypatch this in a less stupid way
         # TODO: Only use this if opensearch isn't available
         os_database_conn_kwargs = {
             e.name: {"sqlalchemy_dsn": "sqlite+aiosqlite:///:memory:"}
-            for e in select_from_extension(group="diracx.db.os")
+            for e in select_from_extension(group="diracx.dbs.os")
         }
         BaseOSDB.available_implementations = partial(
             fake_available_osdb_implementations,

{diracx_testing-0.0.1a27.dist-info → diracx_testing-0.0.1a29.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: diracx-testing
-Version: 0.0.1a27
+Version: 0.0.1a29
 Summary: TODO
 License: GPL-3.0-only
 Classifier: Intended Audience :: Science/Research

{diracx_testing-0.0.1a27.dist-info → diracx_testing-0.0.1a29.dist-info}/RECORD

@@ -4,8 +4,8 @@ diracx/testing/entrypoints.py,sha256=MbH0VLUQz96XPdHzb7XWFwYtWEitAqPrrGM1H1FzDLo
 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=uPI7UssaOkDvaG3Lq1-A-IJCYvhQ1F_HcQsI6N6O-Bw,24417
-diracx_testing-0.0.1a27.dist-info/METADATA,sha256=2brBfD2ehPXTEiLTs9VuDEZfZKQREyWonT-RiVhQ52A,634
-diracx_testing-0.0.1a27.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
-diracx_testing-0.0.1a27.dist-info/top_level.txt,sha256=vJx10tdRlBX3rF2Psgk5jlwVGZNcL3m_7iQWwgPXt-U,7
-diracx_testing-0.0.1a27.dist-info/RECORD,,
+diracx/testing/utils.py,sha256=V2Mcbz_bo2jNEgQB48v4cX_4tsXwX_U6InQspsvZ2E8,24552
+diracx_testing-0.0.1a29.dist-info/METADATA,sha256=QBrVnz6qlvhmUWCaBXAeePfLu5RPcUDJESCjIXpto3M,634
+diracx_testing-0.0.1a29.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+diracx_testing-0.0.1a29.dist-info/top_level.txt,sha256=vJx10tdRlBX3rF2Psgk5jlwVGZNcL3m_7iQWwgPXt-U,7
+diracx_testing-0.0.1a29.dist-info/RECORD,,