fix: RPC tests

Author: giancarloromeo

services/storage/tests/unit/test_rpc_handlers_paths.py

@@ -23,7 +23,6 @@
 from models_library.api_schemas_storage import STORAGE_RPC_NAMESPACE
 from models_library.products import ProductName
 from models_library.projects_nodes_io import LocationID, NodeID, SimcoreS3FileID
-from models_library.rabbitmq_basic_types import RPCMethodName
 from models_library.users import UserID
 from pydantic import ByteSize, TypeAdapter
 from pytest_simcore.helpers.storage_utils import FileIDDict, ProjectWithFilesParams
@@ -69,7 +68,7 @@ async def _assert_compute_path_size(
     path: Path,
     expected_total_size: int,
 ) -> ByteSize:
-    async_job, async_job_name = await compute_path_size(
+    async_job, _ = await compute_path_size(
         storage_rpc_client,
         product_name=product_name,
         user_id=user_id,
@@ -79,7 +78,7 @@ async def _assert_compute_path_size(
     async for job_composed_result in wait_and_get_result(
         storage_rpc_client,
         rpc_namespace=STORAGE_RPC_NAMESPACE,
-        method_name=RPCMethodName(compute_path_size.__name__),
+        method_name=compute_path_size.__name__,
         job_id=async_job.job_id,
         job_filter=AsyncJobFilter(
             user_id=user_id, product_name=product_name, client_name="PYTEST_CLIENT_NAME"
@@ -105,7 +104,7 @@ async def _assert_delete_paths(
     *,
     paths: set[Path],
 ) -> None:
-    async_job, async_job_name = await delete_paths(
+    async_job, _ = await delete_paths(
         storage_rpc_client,
         product_name=product_name,
         user_id=user_id,
@@ -115,7 +114,7 @@ async def _assert_delete_paths(
     async for job_composed_result in wait_and_get_result(
         storage_rpc_client,
         rpc_namespace=STORAGE_RPC_NAMESPACE,
-        method_name=RPCMethodName(compute_path_size.__name__),
+        method_name=compute_path_size.__name__,
         job_id=async_job.job_id,
         job_filter=AsyncJobFilter(
             user_id=user_id, product_name=product_name, client_name="PYTEST_CLIENT_NAME"
@@ -155,6 +154,7 @@ async def test_path_compute_size(
     location_id: LocationID,
     with_random_project_with_files: tuple[
         dict[str, Any],
+        dict[NodeID, dict[str, Any]],
         dict[NodeID, dict[SimcoreS3FileID, FileIDDict]],
     ],
     project_params: ProjectWithFilesParams,
@@ -163,7 +163,7 @@ async def test_path_compute_size(
     assert (
         len(project_params.allowed_file_sizes) == 1
     ), "test preconditions are not filled! allowed file sizes should have only 1 option for this test"
-    project, list_of_files = with_random_project_with_files
+    project, nodes, list_of_files = with_random_project_with_files
 
     total_num_files = sum(
         len(files_in_node) for files_in_node in list_of_files.values()
@@ -182,7 +182,7 @@ async def test_path_compute_size(
     )
 
     # get size of one of the nodes
-    selected_node_id = NodeID(random.choice(list(project["workbench"])))  # noqa: S311
+    selected_node_id = random.choice(list(nodes))  # noqa: S311
     path = Path(project["uuid"]) / f"{selected_node_id}"
     selected_node_s3_keys = [
         Path(s3_object_id) for s3_object_id in list_of_files[selected_node_id]
@@ -333,6 +333,7 @@ async def test_delete_paths(
     location_id: LocationID,
     with_random_project_with_files: tuple[
         dict[str, Any],
+        dict[NodeID, dict[str, Any]],
         dict[NodeID, dict[SimcoreS3FileID, FileIDDict]],
     ],
     project_params: ProjectWithFilesParams,
@@ -342,7 +343,7 @@ async def test_delete_paths(
     assert (
         len(project_params.allowed_file_sizes) == 1
     ), "test preconditions are not filled! allowed file sizes should have only 1 option for this test"
-    project, list_of_files = with_random_project_with_files
+    project, nodes, list_of_files = with_random_project_with_files
 
     total_num_files = sum(
         len(files_in_node) for files_in_node in list_of_files.values()
@@ -362,11 +363,7 @@ async def test_delete_paths(
 
     # now select multiple random files to delete
     selected_paths = random.sample(
-        list(
-            list_of_files[
-                NodeID(random.choice(list(project["workbench"])))  # noqa: S311
-            ]
-        ),
+        list(list_of_files[random.choice(list(nodes))]),  # noqa: S311
         round(project_params.workspace_files_count / 2),
     )
 
@@ -375,7 +372,7 @@ async def test_delete_paths(
         location_id,
         user_id,
         product_name,
-        paths=set({Path(_) for _ in selected_paths}),
+        paths={Path(_) for _ in selected_paths},
     )
 
     # the size is reduced by the amount of deleted files