From eea4548e987d9f06c0c7a197cba9976e8622b305 Mon Sep 17 00:00:00 2001 From: sanderegg <35365065+sanderegg@users.noreply.github.com> Date: Fri, 17 Jan 2025 13:30:27 +0100 Subject: [PATCH] fix usage --- packages/service-library/tests/redis/test_project_lock.py | 2 ++ .../services/background_tasks.py | 2 ++ .../unit/with_dbs/02/test_projects_crud_handlers__delete.py | 5 ++--- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/packages/service-library/tests/redis/test_project_lock.py b/packages/service-library/tests/redis/test_project_lock.py index 643aae22468..c1e12c96828 100644 --- a/packages/service-library/tests/redis/test_project_lock.py +++ b/packages/service-library/tests/redis/test_project_lock.py @@ -67,6 +67,7 @@ async def test_with_project_locked( project_uuid=project_uuid, status=project_status, owner=owner, + notification_cb=None, ) async def _locked_fct() -> None: assert await is_project_locked(redis_client_sdk, project_uuid) is True @@ -118,6 +119,7 @@ async def test_lock_already_locked_project_raises( project_uuid=project_uuid, status=project_status, owner=owner, + notification_cb=None, ) async def _locked_fct() -> None: started_event.set() diff --git a/services/efs-guardian/src/simcore_service_efs_guardian/services/background_tasks.py b/services/efs-guardian/src/simcore_service_efs_guardian/services/background_tasks.py index bb497103ec6..45d89f1bdc1 100644 --- a/services/efs-guardian/src/simcore_service_efs_guardian/services/background_tasks.py +++ b/services/efs-guardian/src/simcore_service_efs_guardian/services/background_tasks.py @@ -25,6 +25,8 @@ async def _lock_project_and_remove_data(app: FastAPI, project_id: ProjectID) -> get_redis_lock_client(app), project_uuid=project_id, status=ProjectStatus.MAINTAINING, + owner=None, + notification_cb=None, ) async def _remove(): await efs_manager.remove_project_efs_data(project_id) diff --git a/services/web/server/tests/unit/with_dbs/02/test_projects_crud_handlers__delete.py b/services/web/server/tests/unit/with_dbs/02/test_projects_crud_handlers__delete.py index 4226a16914c..6dbcbe488ac 100644 --- a/services/web/server/tests/unit/with_dbs/02/test_projects_crud_handlers__delete.py +++ b/services/web/server/tests/unit/with_dbs/02/test_projects_crud_handlers__delete.py @@ -11,7 +11,6 @@ from unittest.mock import MagicMock, call import pytest -import redis.asyncio as aioredis import sqlalchemy as sa from aiohttp.test_utils import TestClient from faker import Faker @@ -38,6 +37,7 @@ from simcore_service_webserver.db.models import UserRole from simcore_service_webserver.projects import _crud_api_delete from simcore_service_webserver.projects.models import ProjectDict +from simcore_service_webserver.redis import get_redis_lock_manager_client_sdk from socketio.exceptions import ConnectionError as SocketConnectionError @@ -148,7 +148,6 @@ async def test_delete_multiple_opened_project_forbidden( user_role: UserRole, expected_ok: HTTPStatus, expected_forbidden: HTTPStatus, - redis_client: aioredis.Redis, ): assert client.app @@ -231,7 +230,7 @@ async def test_delete_project_while_it_is_locked_raises_error( project_uuid = user_project["uuid"] user_id = logged_user["id"] await with_project_locked( - app=client.app, + get_redis_lock_manager_client_sdk(client.app), project_uuid=project_uuid, status=ProjectStatus.CLOSING, owner=Owner(user_id=user_id, first_name=faker.name(), last_name=faker.name()),