ensure test run if tools are not installed

Author: sanderegg

packages/simcore-sdk/tests/integration/conftest.py

@@ -337,7 +337,7 @@ def _assign_config(
 @pytest.fixture
 async def r_clone_settings_factory(
     minio_s3_settings: S3Settings, storage_service: URL
-) -> Awaitable[RCloneSettings]:
+) -> Callable[[], Awaitable[RCloneSettings]]:
     async def _factory() -> RCloneSettings:
         settings = RCloneSettings(
             R_CLONE_S3=minio_s3_settings, R_CLONE_PROVIDER=S3Provider.MINIO
@@ -347,35 +347,35 @@ async def _factory() -> RCloneSettings:
 
         return settings
 
-    return _factory()
+    return _factory
 
 
 @pytest.fixture
 async def aws_s3_cli_settings_factory(
     minio_s3_settings: S3Settings, storage_service: URL
-) -> Awaitable[AwsS3CliSettings]:
+) -> Callable[[], Awaitable[AwsS3CliSettings]]:
     async def _factory() -> AwsS3CliSettings:
         settings = AwsS3CliSettings(AWS_S3_CLI_S3=minio_s3_settings)
         if not await is_aws_s3_cli_available(settings):
             pytest.skip("aws cli not installed")
 
         return settings
 
-    return _factory()
+    return _factory
 
 
 @pytest.fixture
 async def r_clone_settings(
-    r_clone_settings_factory: Awaitable[RCloneSettings],
+    r_clone_settings_factory: Callable[[], Awaitable[RCloneSettings]],
 ) -> RCloneSettings:
-    return await r_clone_settings_factory
+    return await r_clone_settings_factory()
 
 
 @pytest.fixture
 async def aws_s3_cli_settings(
-    aws_s3_cli_settings_factory: Awaitable[AwsS3CliSettings],
+    aws_s3_cli_settings_factory: Callable[[], Awaitable[AwsS3CliSettings]],
 ) -> AwsS3CliSettings:
-    return await aws_s3_cli_settings_factory
+    return await aws_s3_cli_settings_factory()
 
 
 @pytest.fixture

packages/simcore-sdk/tests/integration/test_node_ports_common_filemanager.py

@@ -56,15 +56,17 @@ class _SyncSettings(BaseModel):
         "Both RClone and AwsS3Cli disabled",
     ],
 )
-def optional_sync_settings(
-    r_clone_settings: RCloneSettings,
-    aws_s3_cli_settings: AwsS3CliSettings,
+async def optional_sync_settings(
+    r_clone_settings_factory: Callable[[], Awaitable[RCloneSettings]],
+    aws_s3_cli_settings_factory: Callable[[], Awaitable[AwsS3CliSettings]],
     request: pytest.FixtureRequest,
 ) -> _SyncSettings:
     _rclone_enabled, _aws_s3_cli_enabled = request.param
 
-    _r_clone_settings = r_clone_settings if _rclone_enabled else None
-    _aws_s3_cli_settings = aws_s3_cli_settings if _aws_s3_cli_enabled else None
+    _r_clone_settings = await r_clone_settings_factory() if _rclone_enabled else None
+    _aws_s3_cli_settings = (
+        await aws_s3_cli_settings_factory() if _aws_s3_cli_enabled else None
+    )
 
     return _SyncSettings(
         r_clone_settings=_r_clone_settings, aws_s3_cli_settings=_aws_s3_cli_settings
@@ -82,8 +84,8 @@ def _file_size(size_str: str, **pytest_params):
     [
         _file_size("10Mib"),
         _file_size("103Mib"),
-        _file_size("1003Mib", marks=pytest.mark.heavy_load),
-        _file_size("7Gib", marks=pytest.mark.heavy_load),
+        _file_size("1003Mib"),
+        _file_size("7Gib"),
     ],
     ids=byte_size_ids,
 )