tuning

Author: pcrespov

services/web/server/tests/integration/01/test_garbage_collection.py

@@ -27,6 +27,7 @@
 from pytest_mock import MockerFixture
 from pytest_simcore.helpers.webserver_login import UserInfoDict, log_client_in
 from pytest_simcore.helpers.webserver_projects import create_project, empty_project_data
+from servicelib.aiohttp import status
 from servicelib.aiohttp.application import create_safe_application
 from settings_library.rabbit import RabbitSettings
 from settings_library.redis import RedisDatabase, RedisSettings
@@ -63,15 +64,16 @@
 log = logging.getLogger(__name__)
 
 pytest_simcore_core_services_selection = [
-    "migration",
+    "migration",  # NOTE: rebuild!
     "postgres",
     "rabbit",
     "redis",
-    "storage",
+    "storage",  # NOTE: rebuild!
 ]
 pytest_simcore_ops_services_selection = [
     "minio",
     "adminer",
+    "redis-commander",
 ]
 
 
@@ -98,11 +100,6 @@ async def _delete_all_redis_keys(redis_settings: RedisSettings):
     await client.aclose(close_connection_pool=True)
 
 
-@pytest.fixture(scope="session")
-def osparc_product_name() -> str:
-    return "osparc"
-
-
 @pytest.fixture
 async def director_v2_service_mock(
     mocker: MockerFixture,
@@ -130,7 +127,7 @@ async def director_v2_service_mock(
     with aioresponses(passthrough=PASSTHROUGH_REQUESTS_PREFIXES) as mock:
         mock.get(
             get_computation_pattern,
-            status=202,
+            status=status.HTTP_202_ACCEPTED,
             payload={"state": str(RunningState.NOT_STARTED.value)},
             repeat=True,
         )
@@ -192,16 +189,19 @@ async def client(
 def disable_garbage_collector_task(mocker: MockerFixture) -> mock.MagicMock:
     """patch the setup of the garbage collector so we can call it manually"""
 
-    async def _fake_background_task(app: web.Application):
-        # startup
-        await asyncio.sleep(0.1)
-        yield
-        # teardown
-        await asyncio.sleep(0.1)
+    def _fake_factory():
+        async def _cleanup_ctx_fun(app: web.Application):
+            # startup
+            await asyncio.sleep(0.1)
+            yield
+            # teardown
+            await asyncio.sleep(0.1)
+
+        return _cleanup_ctx_fun
 
     return mocker.patch(
         "simcore_service_webserver.garbage_collector.plugin._tasks_core.create_background_task_for_garbage_collection",
-        side_effect=_fake_background_task,
+        side_effect=_fake_factory,
     )
 
 

services/web/server/tests/unit/isolated/test_garbage_collector_core.py

@@ -124,7 +124,7 @@ async def test_remove_orphaned_services_with_no_running_services_does_nothing(
 def faker_dynamic_service_get() -> Callable[[], DynamicServiceGet]:
     def _() -> DynamicServiceGet:
         return DynamicServiceGet.model_validate(
-            DynamicServiceGet.model_config["json_schema_extra"]["examples"][1]
+            DynamicServiceGet.model_json_schema()["examples"][1]
         )
 
     return _