ensures all test settings

Author: pcrespov

services/agent/tests/unit/test_core_settings.py

@@ -0,0 +1,18 @@
+# pylint: disable=unused-variable
+# pylint: disable=unused-argument
+# pylint: disable=redefined-outer-name
+
+
+from pytest_simcore.helpers.monkeypatch_envs import (
+    EnvVarsDict,
+)
+from simcore_service_agent.core.settings import ApplicationSettings
+
+
+def test_valid_application_settings(app_environment: EnvVarsDict):
+    assert app_environment
+
+    settings = ApplicationSettings()  # type: ignore
+    assert settings
+
+    assert settings == ApplicationSettings.create_from_envs()

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

@@ -33,13 +33,6 @@ def app_environment(
 
 
 def test_valid_application_settings(app_environment: EnvVarsDict):
-    """
-    We can validate actual .env files (also refered as `repo.config` files) by passing them via the CLI
-
-    $ ln -s /path/to/osparc-config/deployments/mydeploy.com/repo.config .secrets
-    $ pytest --external-envfile=.secrets --pdb tests/unit/test_core_settings.py
-
-    """
     assert app_environment
 
     settings = ApplicationSettings()  # type: ignore

services/autoscaling/tests/unit/test_core_settings.py

@@ -2,7 +2,13 @@
 # pylint: disable=redefined-outer-name
 # pylint: disable=unused-argument
 # pylint: disable=unused-variable
+"""
+We can validate actual .env files (also refered as `repo.config` files) by passing them via the CLI
 
+$ ln -s /path/to/osparc-config/deployments/mydeploy.com/repo.config .secrets
+$ pytest --external-envfile=.secrets --pdb tests/unit/test_core_settings.py
+
+"""
 import datetime
 import json
 import logging

services/catalog/tests/unit/test_core_settings.py

@@ -2,20 +2,19 @@
 # pylint: disable=unused-argument
 # pylint: disable=unused-variable
 # pylint: disable=too-many-arguments
+"""
+We can validate actual .env files (also refered as `repo.config` files) by passing them via the CLI
 
+$ ln -s /path/to/osparc-config/deployments/mydeploy.com/repo.config .secrets
+$ pytest --external-envfile=.secrets --pdb tests/unit/test_core_settings.py
+
+"""
 
 from pytest_simcore.helpers.typing_env import EnvVarsDict
 from simcore_service_catalog.core.settings import ApplicationSettings
 
 
 def test_valid_application_settings(app_environment: EnvVarsDict):
-    """
-    We can validate actual .env files (also refered as `repo.config` files) by passing them via the CLI
-
-    $ ln -s /path/to/osparc-config/deployments/mydeploy.com/repo.config .secrets
-    $ pytest --external-envfile=.secrets --pdb tests/unit/test_core_settings.py
-
-    """
     assert app_environment
 
     settings = ApplicationSettings()  # type: ignore

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

@@ -9,7 +9,11 @@
 import pytest
 from aws_library.ec2 import EC2InstanceBootSpecific
 from pydantic import ValidationError
-from pytest_simcore.helpers.monkeypatch_envs import EnvVarsDict, setenvs_from_dict
+from pytest_simcore.helpers.monkeypatch_envs import (
+    EnvVarsDict,
+    delenvs_from_dict,
+    setenvs_from_dict,
+)
 from simcore_service_clusters_keeper.core.settings import ApplicationSettings
 from types_aiobotocore_ec2.literals import InstanceTypeType
 
@@ -110,3 +114,29 @@ def test_valid_primary_custom_tags(
         {"PRIMARY_EC2_INSTANCES_CUSTOM_TAGS": json.dumps(valid_tag)},
     )
     ApplicationSettings.create_from_envs()
+
+
+def test_valid_application_settings(
+    monkeypatch: pytest.MonkeyPatch,
+    external_envfile_dict: EnvVarsDict,
+    app_environment: EnvVarsDict,
+):
+    """
+    We validate actual envfiles (e.g. repo.config files) by passing them via the CLI
+
+    $ ln -s /path/to/osparc-config/deployments/mydeploy.com/repo.config .secrets
+    $ pytest --external-envfile=.secrets --pdb tests/unit/test_core_settings.py
+
+    """
+    assert app_environment
+    if external_envfile_dict:
+        delenvs_from_dict(monkeypatch, app_environment, raising=False)
+        return setenvs_from_dict(
+            monkeypatch,
+            {**external_envfile_dict},
+        )
+
+    settings = ApplicationSettings()  # type: ignore
+    assert settings
+
+    assert settings == ApplicationSettings.create_from_envs()

services/datcore-adapter/tests/unit/test_core_settings.py

@@ -1,6 +1,13 @@
 # pylint: disable=unused-variable
 # pylint: disable=unused-argument
 # pylint: disable=redefined-outer-name
+"""
+We validate actual envfiles (e.g. repo.config files) by passing them via the CLI
+
+$ ln -s /path/to/osparc-config/deployments/mydeploy.com/repo.config .secrets
+$ pytest --external-envfile=.secrets --pdb tests/unit/test_core_settings.py
+
+"""
 
 
 import pytest
@@ -18,12 +25,10 @@ def app_environment(
     app_environment: EnvVarsDict,
     external_envfile_dict: EnvVarsDict,
 ) -> EnvVarsDict:
-    """
-    NOTE: To run against repo.config in osparc-config repo
-
-    ln -s /path/to/osparc-config/deployments/mydeploy.com/repo.config .secrets
-    pytest --external-envfile=.secrets tests/unit/test_core_settings.py
+    """OVERRIDES app_environment fixture:
 
+    Enables using external envfiles (e.g. repo.config files) to run tests against
+    within this test module.
     """
     if external_envfile_dict:
         delenvs_from_dict(monkeypatch, app_environment, raising=False)
@@ -34,9 +39,11 @@ def app_environment(
     return app_environment
 
 
-def test_unit_app_environment(app_environment: EnvVarsDict):
+def test_valid_application_settings(app_environment: EnvVarsDict):
     assert app_environment
-    settings = ApplicationSettings.create_from_envs()
-    print("captured settings: \n", settings.model_dump_json(indent=2))
+
+    settings = ApplicationSettings()  # type: ignore
+    assert settings
+    assert settings == ApplicationSettings.create_from_envs()
 
     assert settings.PENNSIEVE

services/director-v2/tests/unit/test_core_settings.py

@@ -1,6 +1,12 @@
 # pylint:disable=unused-variable
 # pylint:disable=unused-argument
 # pylint:disable=redefined-outer-name
+"""
+We can validate actual .env files (also refered as `repo.config` files) by passing them via the CLI
+
+$ ln -s /path/to/osparc-config/deployments/mydeploy.com/repo.config .secrets
+$ pytest --external-envfile=.secrets --pdb tests/unit/test_core_settings.py
+"""
 
 from typing import Any
 
@@ -27,7 +33,7 @@ def _get_backend_type_options() -> set[str]:
 
 def test_supported_backends_did_not_change() -> None:
     _EXPECTED = {"AWS", "CEPH", "MINIO"}
-    assert _EXPECTED == _get_backend_type_options(), (
+    assert _get_backend_type_options() == _EXPECTED, (
         "Backend configuration change, please code support for "
         "it in volumes_resolver -> _get_s3_volume_driver_config. "
         "When done, adjust above list."

services/director/tests/unit/test_core_settings.py

@@ -2,6 +2,13 @@
 # pylint: disable=unused-argument
 # pylint: disable=unused-variable
 # pylint: disable=too-many-arguments
+"""
+We validate actual envfiles (e.g. repo.config files) by passing them via the CLI
+
+$ ln -s /path/to/osparc-config/deployments/mydeploy.com/repo.config .secrets
+$ pytest --external-envfile=.secrets --pdb tests/unit/test_core_settings.py
+
+"""
 
 
 import datetime
@@ -38,13 +45,6 @@ def app_environment(
 
 
 def test_valid_application_settings(app_environment: EnvVarsDict):
-    """
-    We validate actual envfiles (e.g. repo.config files) by passing them via the CLI
-
-    $ ln -s /path/to/osparc-config/deployments/mydeploy.com/repo.config .secrets
-    $ pytest --external-envfile=.secrets --pdb tests/unit/test_core_settings.py
-
-    """
     settings = ApplicationSettings()  # type: ignore
     assert settings
 

services/dynamic-scheduler/tests/unit/test_core_settings.py

@@ -0,0 +1,47 @@
+# pylint: disable=unused-variable
+# pylint: disable=unused-argument
+# pylint: disable=redefined-outer-name
+"""
+We validate actual envfiles (e.g. repo.config files) by passing them via the CLI
+
+$ ln -s /path/to/osparc-config/deployments/mydeploy.com/repo.config .secrets
+$ pytest --external-envfile=.secrets --pdb tests/unit/test_core_settings.py
+
+"""
+
+
+import pytest
+from pytest_simcore.helpers.monkeypatch_envs import (
+    EnvVarsDict,
+    delenvs_from_dict,
+    setenvs_from_dict,
+)
+from simcore_service_dynamic_scheduler.core.settings import ApplicationSettings
+
+
+@pytest.fixture
+def app_environment(
+    monkeypatch: pytest.MonkeyPatch,
+    app_environment: EnvVarsDict,
+    external_envfile_dict: EnvVarsDict,
+) -> EnvVarsDict:
+    """OVERRIDES app_environment fixture:
+
+    Enables using external envfiles (e.g. repo.config files) to run tests against
+    within this test module.
+    """
+    if external_envfile_dict:
+        delenvs_from_dict(monkeypatch, app_environment, raising=False)
+        return setenvs_from_dict(
+            monkeypatch,
+            {**external_envfile_dict},
+        )
+    return app_environment
+
+
+def test_valid_application_settings(app_environment: EnvVarsDict):
+    assert app_environment
+
+    settings = ApplicationSettings()  # type: ignore
+    assert settings
+    assert settings == ApplicationSettings.create_from_envs()

services/efs-guardian/tests/unit/test_core_settings.py

@@ -1,20 +1,21 @@
 # pylint: disable=redefined-outer-name
 # pylint: disable=unused-argument
 # pylint: disable=unused-variable
+"""
+We can validate actual .env files (also refered as `repo.config` files) by passing them via the CLI
 
+$ ln -s /path/to/osparc-config/deployments/mydeploy.com/repo.config .secrets
+$ pytest --external-envfile=.secrets --pdb tests/unit/test_core_settings.py
+
+"""
 
 from pytest_simcore.helpers.monkeypatch_envs import EnvVarsDict
 from simcore_service_efs_guardian.core.settings import ApplicationSettings
 
 
-def test_settings(app_environment: EnvVarsDict):
-    """
-    We validate actual envfiles (e.g. repo.config files) by passing them via the CLI
-
-    $ ln -s /path/to/osparc-config/deployments/mydeploy.com/repo.config .secrets
-    $ pytest --external-envfile=.secrets --pdb tests/unit/test_core_settings.py
+def test_valid_application_settings(app_environment: EnvVarsDict):
+    assert app_environment
 
-    """
     settings = ApplicationSettings()  # type: ignore
     assert settings