renaming fixture and fixed flaky tests

Author: Andrei Neagu

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

@@ -56,6 +56,7 @@
 from simcore_service_webserver.socketio.plugin import setup_socketio
 from simcore_service_webserver.users.plugin import setup_users
 from sqlalchemy import func, select
+from tenacity import AsyncRetrying, stop_after_delay, wait_fixed
 
 log = logging.getLogger(__name__)
 
@@ -101,7 +102,9 @@ def osparc_product_name() -> str:
 
 
 @pytest.fixture
-async def director_v2_service_mock() -> AsyncIterable[aioresponses]:
+async def director_v2_service_mock(
+    mocker: MockerFixture,
+) -> AsyncIterable[aioresponses]:
     """uses aioresponses to mock all calls of an aiohttpclient
     WARNING: any request done through the client will go through aioresponses. It is
     unfortunate but that means any valid request (like calling the test server) prefix must be set as passthrough.
@@ -115,9 +118,13 @@ async def director_v2_service_mock() -> AsyncIterable[aioresponses]:
     projects_networks_pattern = re.compile(
         r"^http://[a-z\-_]*director-v2:[0-9]+/v2/dynamic_services/projects/.*/-/networks$"
     )
-    dynamic_services_list_pattern = re.compile(
-        r"^http://[a-z\-_]*director-v2:[0-9]+/v2/dynamic_services?.*"
+
+    mocker.patch(
+        "simcore_service_webserver.dynamic_scheduler.api.list_dynamic_services",
+        autospec=True,
+        return_value={},
     )
+
     # NOTE: GitHK I have to copy paste that fixture for some unclear reason for now.
     # I think this is due to some conflict between these non-pytest-simcore fixtures and the loop fixture being defined at different locations?? not sure..
     # anyway I think this should disappear once the garbage collector moves to its own micro-service
@@ -130,7 +137,6 @@ async def director_v2_service_mock() -> AsyncIterable[aioresponses]:
         )
         mock.delete(delete_computation_pattern, status=204, repeat=True)
         mock.patch(projects_networks_pattern, status=204, repeat=True)
-        mock.get(dynamic_services_list_pattern, status=200, repeat=True, payload=[])
         yield mock
 
 
@@ -343,10 +349,18 @@ async def disconnect_user_from_socketio(
     socket_registry = get_registry(client.app)
     await sio.disconnect()
     assert not sio.sid
-    await asyncio.sleep(0)  # just to ensure there is a context switch
-    assert not await socket_registry.find_keys(("socket_id", sio.get_sid()))
-    assert sid not in await socket_registry.find_resources(resource_key, "socket_id")
-    assert not await socket_registry.find_resources(resource_key, "socket_id")
+
+    async for attempt in AsyncRetrying(
+        wait=wait_fixed(0.1),
+        stop=stop_after_delay(10),
+        reraise=True,
+    ):
+        with attempt:
+            assert not await socket_registry.find_keys(("socket_id", sio.get_sid()))
+            assert sid not in await socket_registry.find_resources(
+                resource_key, "socket_id"
+            )
+            assert not await socket_registry.find_resources(resource_key, "socket_id")
 
 
 async def assert_users_count(

services/web/server/tests/unit/with_dbs/02/test_projects_cancellations.py

@@ -89,7 +89,7 @@ async def test_copying_large_project_and_aborting_correctly_removes_new_project(
     catalog_subsystem_mock: Callable[[list[ProjectDict]], None],
     slow_storage_subsystem_mock: MockedStorageSubsystem,
     project_db_cleaner: None,
-    mocked_director_v2_api: dict[str, MagicMock],
+    mocked_dynamic_services_interface: dict[str, MagicMock],
 ):
     assert client.app
     catalog_subsystem_mock([user_project])
@@ -142,7 +142,7 @@ async def test_copying_large_project_and_retrieving_copy_task(
     catalog_subsystem_mock: Callable[[list[ProjectDict]], None],
     slow_storage_subsystem_mock: MockedStorageSubsystem,
     project_db_cleaner: None,
-    mocked_director_v2_api: dict[str, MagicMock],
+    mocked_dynamic_services_interface: dict[str, MagicMock],
 ):
     assert client.app
     catalog_subsystem_mock([user_project])

services/web/server/tests/unit/with_dbs/02/test_projects_crud_handlers__delete.py

@@ -60,7 +60,7 @@ async def test_delete_project(
     user_project: ProjectDict,
     expected: ExpectedResponse,
     storage_subsystem_mock: MockedStorageSubsystem,
-    mocked_director_v2_api: dict[str, MagicMock],
+    mocked_dynamic_services_interface: dict[str, MagicMock],
     catalog_subsystem_mock: Callable[[list[ProjectDict]], None],
     fake_services: Callable[..., Awaitable[list[DynamicServiceGet]]],
     assert_get_same_project_caller: Callable,
@@ -70,7 +70,7 @@ async def test_delete_project(
 
     # DELETE /v0/projects/{project_id}
     fakes = await fake_services(5)
-    mocked_director_v2_api[
+    mocked_dynamic_services_interface[
         "dynamic_scheduler.api.list_dynamic_services"
     ].return_value = fakes
 
@@ -90,7 +90,7 @@ async def test_delete_project(
         # might have finished, and therefore there is no need to waith
         await tasks[0]
 
-        mocked_director_v2_api[
+        mocked_dynamic_services_interface[
             "dynamic_scheduler.api.list_dynamic_services"
         ].assert_called_once()
 
@@ -108,7 +108,7 @@ async def test_delete_project(
             )
             for service in fakes
         ]
-        mocked_director_v2_api[
+        mocked_dynamic_services_interface[
             "dynamic_scheduler.api.stop_dynamic_service"
         ].assert_has_calls(expected_calls)
 
@@ -141,7 +141,7 @@ async def test_delete_multiple_opened_project_forbidden(
     client: TestClient,
     logged_user: UserInfoDict,
     user_project: ProjectDict,
-    mocked_director_v2_api,
+    mocked_dynamic_services_interface,
     create_dynamic_service_mock: Callable[..., Awaitable[DynamicServiceGet]],
     socketio_client_factory: Callable,
     client_session_id_factory: Callable,

services/web/server/tests/unit/with_dbs/02/test_projects_metadata_handlers.py

@@ -41,7 +41,7 @@
 @pytest.mark.parametrize(*standard_user_role_response())
 async def test_custom_metadata_handlers(
     # for deletion
-    mocked_director_v2_api: dict[str, MagicMock],
+    mocked_dynamic_services_interface: dict[str, MagicMock],
     storage_subsystem_mock: MockedStorageSubsystem,
     #
     client: TestClient,
@@ -115,7 +115,7 @@ async def _wait_until_deleted():
 @pytest.mark.parametrize(*standard_user_role_response())
 async def test_new_project_with_parent_project_node(
     # for deletion
-    mocked_director_v2_api: dict[str, MagicMock],
+    mocked_dynamic_services_interface: dict[str, MagicMock],
     storage_subsystem_mock: MockedStorageSubsystem,
     #
     client: TestClient,
@@ -192,7 +192,7 @@ async def test_new_project_with_parent_project_node(
 @pytest.mark.parametrize(*standard_user_role_response())
 async def test_new_project_with_invalid_parent_project_node(
     # for deletion
-    mocked_director_v2_api: dict[str, MagicMock],
+    mocked_dynamic_services_interface: dict[str, MagicMock],
     storage_subsystem_mock: MockedStorageSubsystem,
     #
     client: TestClient,
@@ -275,7 +275,7 @@ async def test_new_project_with_invalid_parent_project_node(
 @pytest.mark.parametrize(*standard_user_role_response())
 async def test_set_project_parent_backward_compatibility(
     # for deletion
-    mocked_director_v2_api: dict[str, MagicMock],
+    mocked_dynamic_services_interface: dict[str, MagicMock],
     storage_subsystem_mock: MockedStorageSubsystem,
     #
     client: TestClient,
@@ -339,7 +339,7 @@ async def test_set_project_parent_backward_compatibility(
 @pytest.mark.parametrize(*standard_user_role_response())
 async def test_update_project_metadata_backward_compatibility_with_same_project_does_not_raises_and_does_not_work(
     # for deletion
-    mocked_director_v2_api: dict[str, MagicMock],
+    mocked_dynamic_services_interface: dict[str, MagicMock],
     storage_subsystem_mock: MockedStorageSubsystem,
     #
     client: TestClient,
@@ -394,7 +394,7 @@ async def test_update_project_metadata_backward_compatibility_with_same_project_
 @pytest.mark.parametrize(*standard_user_role_response())
 async def test_update_project_metadata_s4lacad_backward_compatibility_passing_nil_parent_node_id(
     # for deletion
-    mocked_director_v2_api: dict[str, MagicMock],
+    mocked_dynamic_services_interface: dict[str, MagicMock],
     storage_subsystem_mock: MockedStorageSubsystem,
     #
     client: TestClient,