test(carbonserver): unit tests were escaped (#1068)

Author: inimaz

carbonserver/carbonserver/api/schemas.py

@@ -332,7 +332,7 @@ class AccessLevel(Enum):
 # Used in the responses to the user
 class ProjectToken(BaseModel):
     id: UUID
-    project_id: UUID
+    project_id: UUID | str
     name: Optional[str]
     token: Optional[str] = None
     last_used: Optional[datetime] = None

carbonserver/carbonserver/api/services/auth_context.py

@@ -14,7 +14,6 @@
 
 
 class AuthContext:
-
     def __init__(
         self,
         user_repository: UserRepository,
@@ -30,7 +29,7 @@ def isOperationAuthorizedOnOrg(self, organization_id, user: User):
             organization_id=organization_id, user=user
         )
 
-    def isOperationAuthorizedOnProject(self, project_id: UUID, user: User):
+    def isOperationAuthorizedOnProject(self, project_id: UUID | str, user: User):
         return self._user_repository.is_user_authorized_on_project(project_id, user.id)
 
     def can_read_project(self, project_id: UUID, user: Optional[User]):

carbonserver/tests/api/routers/test_emissions.py

@@ -55,6 +55,9 @@
     "ram_energy": 2.0,
     "energy_consumed": 57.21874,
     "wue": 0,
+    "cpu_utilization_percent": None,
+    "gpu_utilization_percent": None,
+    "ram_utilization_percent": None,
 }
 
 EMISSION_2 = {

carbonserver/tests/api/routers/test_project_tokens.py

@@ -1,6 +1,9 @@
+import re
 from unittest import mock
 
 import pytest
+from api.mocks import FakeAuthContext, FakeUserWithAuthDependency
+from dependency_injector import providers
 from fastapi import FastAPI, status
 from fastapi.testclient import TestClient
 
@@ -9,6 +12,7 @@
 )
 from carbonserver.api.routers import project_api_tokens
 from carbonserver.api.schemas import ProjectToken
+from carbonserver.api.services.auth_service import MandatoryUserWithAuthDependency
 from carbonserver.container import ServerContainer
 
 PROJECT_ID = "f52fe339-164d-4c2b-a8c0-f562dfce066d"
@@ -25,9 +29,10 @@
     "id": PROJECT_TOKEN_ID,
     "project_id": PROJECT_ID,
     "name": "Token API Code Carbon",
-    "token": "token",
+    "token": "cpt_some_token",
     "access": 2,
     "last_used": None,
+    "revoked": False,
 }
 
 
@@ -38,6 +43,10 @@ def custom_test_server():
     app = FastAPI()
     app.container = container
     app.include_router(project_api_tokens.router)
+    app.dependency_overrides[MandatoryUserWithAuthDependency] = (
+        FakeUserWithAuthDependency
+    )
+    app.container.auth_context.override(providers.Factory(FakeAuthContext))
     yield app
 
 
@@ -60,7 +69,13 @@ def test_add_project_token(client, custom_test_server):
         actual_project_token = response.json()
 
     assert response.status_code == status.HTTP_201_CREATED
-    assert actual_project_token == expected_project_token
+    # Check all fields except 'token'
+    for key in expected_project_token:
+        if key != "token":
+            assert actual_project_token[key] == expected_project_token[key]
+
+    # Check token format: cpt_ + 32 alphanumeric chars
+    assert re.fullmatch(r"cpt_[a-zA-Z0-9_\-]{43,44}", actual_project_token["token"])
 
 
 def test_delete_project_token(client, custom_test_server):

carbonserver/tests/api/routers/test_users.py

@@ -69,24 +69,6 @@ def client(custom_test_server):
     yield TestClient(custom_test_server)
 
 
-def test_list_users_list_all_existing_users_with_200(client, custom_test_server):
-    repository_mock = mock.Mock(spec=UsersRepository)
-    expected_user = USER_1
-    expected_user_2 = USER_2
-    expected_user_list = [expected_user, expected_user_2]
-    repository_mock.list_users.return_value = [
-        User(**expected_user),
-        User(**expected_user_2),
-    ]
-
-    with custom_test_server.container.user_repository.override(repository_mock):
-        response = client.get("/users")
-        actual_user_list = response.json()
-
-    assert response.status_code == status.HTTP_200_OK
-    assert actual_user_list == expected_user_list
-
-
 def test_get_user_by_id_returns_correct_user_with_correct_id(
     client, custom_test_server
 ):

pyproject.toml

@@ -174,7 +174,7 @@ pre-commit-install = { cmd = "pre-commit install", help = "Install pre-commit ho
 dashboard = "cd carbonserver && uvicorn main:app --reload"
 dashboard-ci = "cd carbonserver && uvicorn main:app --host 0.0.0.0 --port 8008"
 docker = "docker-compose up -d"
-test-api-unit = "cd carbonserver && python -m pytest -vv tests/api/routers/test_projects.py && python -m pytest -vv tests/api/service/ && python -m pytest -vv tests/api/usecase/"
+test-api-unit = "cd carbonserver && python -m pytest -vv tests/api/routers && python -m pytest -vv tests/api/service/ && python -m pytest -vv tests/api/usecase/"
 test-api-integ = "cd carbonserver && python -m pytest -vv tests/api/integration/"
 setup-db = "cd carbonserver && python3 -m alembic -c carbonserver/database/alembic.ini upgrade head"
 downgrade-db = "cd carbonserver && python -m alembic -c carbonserver/database/alembic.ini downgrade base"