fix

Author: sanderegg

packages/aws-library/tests/test_ec2_client.py

@@ -52,8 +52,7 @@ async def simcore_ec2_api(
     await ec2.close()
 
 
-async def test_ec2_client_lifespan(simcore_ec2_api: SimcoreEC2API):
-    ...
+async def test_ec2_client_lifespan(simcore_ec2_api: SimcoreEC2API): ...
 
 
 async def test_aiobotocore_ec2_client_when_ec2_server_goes_up_and_down(
@@ -107,12 +106,12 @@ async def test_get_ec2_instance_capabilities(
     simcore_ec2_api: SimcoreEC2API,
     ec2_allowed_instances: list[InstanceTypeType],
 ):
-    instance_types: list[
-        EC2InstanceType
-    ] = await simcore_ec2_api.get_ec2_instance_capabilities(
-        cast(
-            set[InstanceTypeType],
-            set(ec2_allowed_instances),
+    instance_types: list[EC2InstanceType] = (
+        await simcore_ec2_api.get_ec2_instance_capabilities(
+            cast(
+                set[InstanceTypeType],
+                set(ec2_allowed_instances),
+            )
         )
     )
     assert instance_types
@@ -125,7 +124,9 @@ async def test_get_ec2_instance_capabilities_returns_all_options(
     instance_types = await simcore_ec2_api.get_ec2_instance_capabilities("ALL")
     assert instance_types
     # NOTE: this might need adaptation when moto is updated
-    assert 700 < len(instance_types) < 852
+    assert (
+        850 < len(instance_types) < 877
+    ), f"received {len(instance_types)}, the test might need adaptation"
 
 
 async def test_get_ec2_instance_capabilities_raise_with_empty_set(
@@ -151,9 +152,9 @@ async def fake_ec2_instance_type(
     request: pytest.FixtureRequest,
 ) -> EC2InstanceType:
     instance_type_name: InstanceTypeType = request.param
-    instance_types: list[
-        EC2InstanceType
-    ] = await simcore_ec2_api.get_ec2_instance_capabilities({instance_type_name})
+    instance_types: list[EC2InstanceType] = (
+        await simcore_ec2_api.get_ec2_instance_capabilities({instance_type_name})
+    )
 
     assert len(instance_types) == 1
     return instance_types[0]

packages/aws-library/tests/test_s3_client.py

@@ -1133,14 +1133,13 @@ async def test_create_multipart_presigned_upload_link(
     assert s3_metadata.last_modified
     assert s3_metadata.e_tag == f"{json.loads(received_e_tag)}"
 
-    # completing again raises
-    with pytest.raises(S3UploadNotFoundError):
-        await simcore_s3_api.complete_multipart_upload(
-            bucket=with_s3_bucket,
-            object_key=file_id,
-            upload_id=upload_links.upload_id,
-            uploaded_parts=uploaded_parts,
-        )
+    # completing again does not raise anymore (was raising until moto==5.0.21)
+    await simcore_s3_api.complete_multipart_upload(
+        bucket=with_s3_bucket,
+        object_key=file_id,
+        upload_id=upload_links.upload_id,
+        uploaded_parts=uploaded_parts,
+    )
 
 
 @pytest.mark.parametrize(