44# pylint: disable=unused-argument
55# pylint: disable=unused-variable
66
7- import re
87import uuid as uuidlib
98from collections .abc import Awaitable , Callable , Iterator
109from http import HTTPStatus
1615from aiohttp .test_utils import TestClient
1716from aioresponses import aioresponses
1817from faker import Faker
18+ from models_library .api_schemas_directorv2 .dynamic_services import (
19+ GetProjectInactivityResponse ,
20+ )
1921from models_library .products import ProductName
2022from models_library .projects_state import ProjectState
2123from pydantic import TypeAdapter
24+ from pytest_mock import MockerFixture
2225from pytest_simcore .helpers .assert_checks import assert_status
2326from pytest_simcore .helpers .webserver_login import UserInfoDict
2427from pytest_simcore .helpers .webserver_parametrizations import (
@@ -651,18 +654,10 @@ async def test_new_template_from_project(
651654
652655
653656@pytest .fixture
654- def mock_director_v2_inactivity (
655- aioresponses_mocker : aioresponses , is_inactive : bool
656- ) -> None :
657- aioresponses_mocker .clear ()
658- get_services_pattern = re .compile (
659- r"^http://[a-z\-_]*director-v2:[0-9]+/v2/dynamic_services/projects/.*/inactivity.*$"
660- )
661- aioresponses_mocker .get (
662- get_services_pattern ,
663- status = status .HTTP_200_OK ,
664- repeat = True ,
665- payload = {"is_inactive" : is_inactive },
657+ def mock_dynamic_scheduler_inactivity (mocker : MockerFixture , is_inactive : bool ) -> None :
658+ mocker .patch (
659+ "simcore_service_webserver.projects.projects_api.dynamic_scheduler_api.get_project_inactivity" ,
660+ return_value = GetProjectInactivityResponse (is_inactive = is_inactive ),
666661 )
667662
668663
@@ -675,7 +670,7 @@ def mock_director_v2_inactivity(
675670)
676671@pytest .mark .parametrize ("is_inactive" , [True , False ])
677672async def test_get_project_inactivity (
678- mock_director_v2_inactivity : None ,
673+ mock_dynamic_scheduler_inactivity : None ,
679674 logged_user : UserInfoDict ,
680675 client : TestClient ,
681676 faker : Faker ,
0 commit comments