missing fixture

Author: sanderegg

services/clusters-keeper/tests/unit/test_modules_redis.py

@@ -10,6 +10,7 @@
 async def test_redis_raises_if_missing(
     disabled_rabbitmq: None,
     disabled_ec2: None,
+    disabled_ssm: None,
     mocked_redis_server: None,
     initialized_app: FastAPI,
 ):

services/clusters-keeper/tests/unit/test_modules_remote_debug.py

@@ -23,6 +23,7 @@ def app_environment(
 def test_application_with_debug_enabled(
     disabled_rabbitmq: None,
     disabled_ec2: None,
+    disabled_ssm: None,
     mocked_redis_server: None,
     initialized_app: FastAPI,
 ):

services/clusters-keeper/tests/unit/test_modules_ssm.py

@@ -6,7 +6,6 @@
 import pytest
 from fastapi import FastAPI
 from simcore_service_clusters_keeper.core.errors import ConfigurationError
-from simcore_service_clusters_keeper.modules.ec2 import get_ec2_client
 from simcore_service_clusters_keeper.modules.ssm import get_ssm_client
 
 
@@ -17,9 +16,7 @@ async def test_ssm_does_not_initialize_if_ssm_deactivated(
     mocked_redis_server: None,
     initialized_app: FastAPI,
 ):
-    assert hasattr(initialized_app.state, "ec2_client")
-    assert initialized_app.state.ec2_client is None
+    assert hasattr(initialized_app.state, "ssm_client")
+    assert initialized_app.state.ssm_client is None
     with pytest.raises(ConfigurationError):
-        get_ec2_client(initialized_app)
-
-    assert get_ssm_client(initialized_app)
+        get_ssm_client(initialized_app)

services/clusters-keeper/tests/unit/test_utils_ec2.py

@@ -25,6 +25,7 @@ def wallet_id(faker: Faker) -> WalletID:
 def test_get_cluster_name(
     disabled_rabbitmq: None,
     disabled_ec2: None,
+    disabled_ssm: None,
     mocked_redis_server: None,
     app_settings: ApplicationSettings,
     user_id: UserID,
@@ -46,6 +47,17 @@ def test_get_cluster_name(
         == f"{app_settings.CLUSTERS_KEEPER_EC2_INSTANCES_PREFIX}osparc-computational-cluster-worker-{app_settings.SWARM_STACK_NAME}-user_id:{user_id}-wallet_id:{wallet_id}"
     )
 
+    assert (
+        get_cluster_name(app_settings, user_id=user_id, wallet_id=None, is_manager=True)
+        == f"{app_settings.CLUSTERS_KEEPER_EC2_INSTANCES_PREFIX}osparc-computational-cluster-manager-{app_settings.SWARM_STACK_NAME}-user_id:{user_id}-wallet_id:None"
+    )
+    assert (
+        get_cluster_name(
+            app_settings, user_id=user_id, wallet_id=None, is_manager=False
+        )
+        == f"{app_settings.CLUSTERS_KEEPER_EC2_INSTANCES_PREFIX}osparc-computational-cluster-worker-{app_settings.SWARM_STACK_NAME}-user_id:{user_id}-wallet_id:None"
+    )
+
 
 def test_creation_ec2_tags(
     mocked_ec2_server_envs: EnvVarsDict,