fix: Fixing tests

Author: Robin-Van-de-Merghel

diracx-db/src/diracx/db/sql/pilot_agents/db.py

@@ -4,7 +4,7 @@
 from os import urandom
 
 from sqlalchemy import DateTime, insert, select, update
-from sqlalchemy.exc import IntegrityError
+from sqlalchemy.exc import IntegrityError, NoResultFound
 
 from diracx.core.exceptions import (
     AuthorizationError,
@@ -79,7 +79,10 @@ async def verify_pilot_secret(
     ) -> None:
         hashed_secret = hash(pilot_secret)
 
-        pilot = await self.get_pilot_by_reference(pilot_job_reference)
+        try:
+            pilot = await self.get_pilot_by_reference(pilot_job_reference)
+        except NoResultFound as e:
+            raise PilotNotFoundError(pilot_ref=pilot_job_reference) from e
 
         pilot_id = pilot["PilotID"]
 

diracx-routers/src/diracx/routers/auth/pilot.py

@@ -2,7 +2,7 @@
 
 from fastapi import HTTPException, status
 
-from diracx.core.exceptions import AuthorizationError
+from diracx.core.exceptions import AuthorizationError, PilotNotFoundError
 from diracx.logic.auth.token import create_token, exchange_token
 
 from ..dependencies import (
@@ -36,6 +36,11 @@ async def pilot_login(
         raise HTTPException(
             status_code=status.HTTP_401_UNAUTHORIZED, detail=e.detail
         ) from e
+    except PilotNotFoundError as e:
+        raise HTTPException(
+            status_code=status.HTTP_401_UNAUTHORIZED,
+            detail="bad pilot_id / pilot_secret",
+        ) from e
 
     pilot = await pilot_db.get_pilot_by_reference(pilot_ref=pilot_job_reference)
 

diracx-routers/tests/auth/test_pilot_auth.py

@@ -48,7 +48,7 @@ async def test_create_pilot_and_verify_secret(test_client):
 
     assert secret is not None
 
-    request_data = {"pilot_reference": pilot_reference, "pilot_secret": secret}
+    request_data = {"pilot_job_reference": pilot_reference, "pilot_secret": secret}
 
     r = test_client.post(
         "/api/auth/pilot-login",
@@ -88,7 +88,7 @@ async def test_create_pilot_and_verify_secret(test_client):
 
     # -----------------  Wrong password  -----------------
     request_data = {
-        "pilot_reference": pilot_reference,
+        "pilot_job_reference": pilot_reference,
         "pilot_secret": "My 1ncr3d1bl3 t0k3n",
     }
 
@@ -102,7 +102,7 @@ async def test_create_pilot_and_verify_secret(test_client):
     assert r.json()["detail"] == "bad pilot_id / pilot_secret"
 
     # -----------------  Wrong ID  -----------------
-    request_data = {"pilot_id": 63000, "pilot_secret": secret}
+    request_data = {"pilot_job_reference": "It is a reference", "pilot_secret": secret}
 
     r = test_client.post(
         "/api/auth/pilot-login",