test fixes

Author: bisgaard-itis

services/storage/tests/unit/test_rpc_handlers_paths.py

@@ -26,7 +26,7 @@
 from models_library.users import UserID
 from pydantic import ByteSize, TypeAdapter
 from pytest_simcore.helpers.storage_utils import FileIDDict, ProjectWithFilesParams
-from servicelib.celery.models import OwnerMetadata
+from servicelib.celery.models import OwnerMetadata, Wildcard
 from servicelib.rabbitmq._client_rpc import RabbitMQRPCClient
 from servicelib.rabbitmq.rpc_interfaces.async_jobs.async_jobs import (
     wait_and_get_result,
@@ -43,6 +43,11 @@
 _IsFile: TypeAlias = bool
 
 
+class TestOwnerMetadata(OwnerMetadata):
+    user_id: int | Wildcard
+    product_name: str | Wildcard
+
+
 def _filter_and_group_paths_one_level_deeper(
     paths: list[Path], prefix: Path
 ) -> list[tuple[Path, _IsFile]]:
@@ -73,17 +78,18 @@ async def _assert_compute_path_size(
         storage_rpc_client,
         location_id=location_id,
         path=path,
-        owner_metadata=OwnerMetadata(
-            user_id=user_id, product_name=product_name, owner="PYTEST_CLIENT_NAME"
+        owner_metadata=TestOwnerMetadata(
+            user_id=user_id, product_name=product_name, owner="pytest_client_name"
         ),
+        user_id=user_id,
     )
     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__),
         job_id=async_job.job_id,
-        owner_metadata=OwnerMetadata(
-            user_id=user_id, product_name=product_name, owner="PYTEST_CLIENT_NAME"
+        owner_metadata=TestOwnerMetadata(
+            user_id=user_id, product_name=product_name, owner="pytest_client_name"
         ),
         client_timeout=datetime.timedelta(seconds=120),
     ):
@@ -110,17 +116,18 @@ async def _assert_delete_paths(
         storage_rpc_client,
         location_id=location_id,
         paths=paths,
-        owner_metadata=OwnerMetadata(
-            user_id=user_id, product_name=product_name, owner="PYTEST_CLIENT_NAME"
+        owner_metadata=TestOwnerMetadata(
+            user_id=user_id, product_name=product_name, owner="pytest_client_name"
         ),
+        user_id=user_id,
     )
     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__),
         job_id=async_job.job_id,
-        owner_metadata=OwnerMetadata(
-            user_id=user_id, product_name=product_name, owner="PYTEST_CLIENT_NAME"
+        owner_metadata=TestOwnerMetadata(
+            user_id=user_id, product_name=product_name, owner="pytest_client_name"
         ),
         client_timeout=datetime.timedelta(seconds=120),
     ):