From c805d98557bf6d7bec49735b1ecffa095a5e7512 Mon Sep 17 00:00:00 2001 From: wakonig_k Date: Mon, 20 Jan 2025 21:35:35 +0100 Subject: [PATCH] tests: adjusted tests to new api --- backend/tests/test_login.py | 4 ++-- backend/tests/test_scan_ingestor.py | 13 +++++++------ 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/backend/tests/test_login.py b/backend/tests/test_login.py index 872e70c..9d1827b 100644 --- a/backend/tests/test_login.py +++ b/backend/tests/test_login.py @@ -30,7 +30,7 @@ def test_login_wrong_password(backend_client): "/api/v1/user/login", json={"username": "admin@bec_atlas.ch", "password": "wrong_password"} ) assert response.status_code == 401 - assert response.json() == {"detail": "Invalid password"} + assert response.json() == {"detail": "User not found or password is incorrect"} @pytest.mark.timeout(60) @@ -43,4 +43,4 @@ def test_login_unknown_user(backend_client): json={"username": "no_user@bec_atlas.ch", "password": "wrong_password"}, ) assert response.status_code == 404 - assert response.json() == {"detail": "User not found"} + assert response.json() == {"detail": "User not found or password is incorrect"} diff --git a/backend/tests/test_scan_ingestor.py b/backend/tests/test_scan_ingestor.py index 9fcb1e1..5152828 100644 --- a/backend/tests/test_scan_ingestor.py +++ b/backend/tests/test_scan_ingestor.py @@ -1,7 +1,8 @@ import pytest -from bec_atlas.ingestor.data_ingestor import DataIngestor from bec_lib import messages +from bec_atlas.ingestor.data_ingestor import DataIngestor + @pytest.fixture def scan_ingestor(backend): @@ -76,7 +77,7 @@ def test_scan_ingestor_create_scan(scan_ingestor, backend): }, timestamp=1732610545.15924, ) - scan_ingestor.update_scan_status(msg, deployment_id="5cc67967-744d-4115-a46b-13246580cb3f") + scan_ingestor.update_scan_status(msg, deployment_id="678aa8d4875568640bd92174") response = client.post( "/api/v1/user/login", json={"username": "admin@bec_atlas.ch", "password": "admin"} @@ -85,7 +86,7 @@ def test_scan_ingestor_create_scan(scan_ingestor, backend): session_id = msg.info.get("session_id") scan_id = msg.scan_id - response = client.get(f"/api/v1/scans/session/{session_id}") + response = client.get("/api/v1/scans/session", params={"session_id": session_id}) assert response.status_code == 200 out = response.json()[0] # assert out["session_id"] == session_id @@ -93,14 +94,14 @@ def test_scan_ingestor_create_scan(scan_ingestor, backend): assert out["status"] == "open" msg.status = "closed" - scan_ingestor.update_scan_status(msg, deployment_id="5cc67967-744d-4115-a46b-13246580cb3f") - response = client.get(f"/api/v1/scans/id/{scan_id}") + scan_ingestor.update_scan_status(msg, deployment_id="678aa8d4875568640bd92174") + response = client.get("/api/v1/scans/id", params={"scan_id": scan_id}) assert response.status_code == 200 out = response.json() assert out["status"] == "closed" assert out["scan_id"] == scan_id - response = client.get(f"/api/v1/scans/session/{session_id}") + response = client.get("/api/v1/scans/session", params={"session_id": session_id}) assert response.status_code == 200 out = response.json() assert len(out) == 1