migration

Author: sanderegg

services/storage/tests/conftest.py

@@ -174,12 +174,12 @@ def app_settings(
             monkeypatch.delenv("S3_ENDPOINT")
             setenvs_from_dict(
                 monkeypatch,
-                s3_settings.dict(exclude={"S3_ENDPOINT"}),
+                s3_settings.model_dump(exclude={"S3_ENDPOINT"}),
             )
         else:
             setenvs_from_dict(
                 monkeypatch,
-                s3_settings.dict(),
+                s3_settings.model_dump(),
             )
     test_app_settings = Settings.create_from_envs()
     print(f"{test_app_settings.model_dump_json(indent=2)=}")
@@ -463,7 +463,7 @@ async def _directory_creator(dir_name: str):
 
         directory_file_id = create_simcore_file_id(project_id, node_id, dir_name)
         directory_file_upload: FileUploadSchema = await create_upload_file_link_v2(
-            directory_file_id, link_type="s3", is_directory="true", file_size=-1
+            directory_file_id, link_type="s3", is_directory="true", file_size=0
         )
         # always returns a v2 link when dealing with directories
         assert isinstance(directory_file_upload, FileUploadSchema)

services/storage/tests/unit/test_dsm_dsmcleaner.py

@@ -3,7 +3,6 @@
 # pylint: disable=redefined-outer-name
 # pylint: disable=too-many-arguments
 # pylint: disable=too-many-branches
-# pylint: disable=too-many-positional-arguments
 # pylint: disable=unused-argument
 # pylint: disable=unused-variable
 
@@ -48,7 +47,7 @@ def disabled_dsm_cleaner_task(monkeypatch: pytest.MonkeyPatch):
 @pytest.fixture
 def simcore_directory_id(simcore_file_id: SimcoreS3FileID) -> SimcoreS3FileID:
     return TypeAdapter(SimcoreS3FileID).validate_python(
-        Path(SimcoreS3DirectoryID.from_simcore_s3_object(simcore_file_id))
+        SimcoreS3DirectoryID.from_simcore_s3_object(simcore_file_id)
     )
 
 
@@ -298,7 +297,7 @@ async def test_clean_expired_uploads_reverts_to_last_known_version_expired_pendi
     # check the entries were reverted
     async with aiopg_engine.acquire() as conn:
         reverted_fmd = await db_file_meta_data.get(conn, file_id)
-    assert original_fmd.dict(exclude={"created_at"}) == reverted_fmd.dict(
+    assert original_fmd.model_dump(exclude={"created_at"}) == reverted_fmd.model_dump(
         exclude={"created_at"}
     )
     # check the S3 content is the old file