fix tests

Author: bisgaard-itis

services/api-server/src/simcore_service_api_server/api/routes/files.py

@@ -15,14 +15,13 @@
 )
 from models_library.basic_types import SHA256Str
 from models_library.projects_nodes_io import NodeID
-from pydantic import AnyUrl, PositiveInt, TypeAdapter, ValidationError
+from pydantic import PositiveInt, ValidationError
 from servicelib.fastapi.requests_decorators import cancel_on_disconnect
 from simcore_sdk.node_ports_common.constants import SIMCORE_LOCATION
 from simcore_sdk.node_ports_common.file_io_utils import UploadableFileObject
 from simcore_sdk.node_ports_common.filemanager import (
     UploadedFile,
     UploadedFolder,
-    abort_upload,
 )
 from simcore_sdk.node_ports_common.filemanager import upload_path as storage_upload_path
 from starlette.datastructures import URL
@@ -413,12 +412,7 @@ async def abort_multipart_upload(
     file = await _create_domain_file(
         webserver_api=webserver_api, file_id=file_id, client_file=client_file
     )
-    abort_link: URL = await storage_client.create_abort_upload_link(
-        file=file, query={"user_id": str(user_id)}
-    )
-    await abort_upload(
-        abort_upload_link=TypeAdapter(AnyUrl).validate_python(str(abort_link))
-    )
+    await storage_client.abort_file_upload(user_id=user_id, file=file)
 
 
 @router.post(

services/api-server/src/simcore_service_api_server/services_http/storage.py

@@ -189,7 +189,7 @@ async def get_file_upload_links(
 
         # complete_upload_file
         response = await self.client.put(
-            f"/locations/{self.SIMCORE_S3_ID}/files/{file.storage_file_id}",
+            f"/locations/{self.SIMCORE_S3_ID}/files/{file.quoted_storage_file_id}:upload",
             params=query_params,
         )
         response.raise_for_status()
@@ -242,6 +242,14 @@ async def complete_file_upload(self, *, user_id: int, file: File) -> ETag:
             detail=msg,
         )
 
+    @_exception_mapper(http_status_map={})
+    async def abort_file_upload(self, *, user_id: int, file: File) -> None:
+        response = await self.client.post(
+            f"/locations/{self.SIMCORE_S3_ID}/files/{file.quoted_storage_file_id}:abort",
+            params={"user_id": f"{user_id}"},
+        )
+        response.raise_for_status()
+
     async def create_complete_upload_link(
         self, *, file: File, query: dict[str, str] | None = None
     ) -> URL:

services/api-server/tests/unit/conftest.py

@@ -494,7 +494,7 @@ def generate_future_link(request: Request, **kwargs):
 
         respx_mock.post(
             re.compile(
-                r"^http://[a-z\-_]*storage:[0-9]+/v0/locations/[0-9]+/files/.+:abort$"
+                r"^http://[a-z\-_]*storage:[0-9]+/v0/locations/[0-9]+/files/.+:abort(?:\?.*)?$"
             ),
             name="abort_upload_file_v0_locations__location_id__files__file_id__abort_post",
         ).respond(

services/api-server/tests/unit/test_api_files.py

@@ -14,8 +14,6 @@
 import pytest
 import respx
 import yarl
-from aiohttp import client_exceptions as aiohttp_client_exceptions
-from aioresponses import aioresponses as AioResponsesMock
 from faker import Faker
 from fastapi import status
 from fastapi.encoders import jsonable_encoder
@@ -286,15 +284,12 @@ async def test_get_upload_links(
 async def test_get_upload_links_timeout(
     client: AsyncClient,
     auth: httpx.BasicAuth,
-    aioresponses_mocker: AioResponsesMock,
+    mocked_storage_rest_api_base: MockRouter,
     mocker: MockerFixture,
 ):
-    assert aioresponses_mocker  # nosec
-    aioresponses_mocker.put(
+    mocked_endpoint = mocked_storage_rest_api_base.put(
         re.compile(r"^http://[a-z\-_]*storage:[0-9]+/v0/locations/[0-9]+/files.+$"),
-        repeat=True,
-        exception=aiohttp_client_exceptions.ServerTimeoutError(),
-    )
+    ).mock(side_effect=httpx.ReadTimeout("Mocked timeout error"))
 
     msg = {
         "filename": DummyFileData.file().filename,
@@ -304,6 +299,7 @@ async def test_get_upload_links_timeout(
 
     response = await client.post(f"{API_VTAG}/files/content", json=msg, auth=auth)
 
+    assert mocked_endpoint.called
     assert response.status_code == status.HTTP_504_GATEWAY_TIMEOUT