director

Author: pcrespov

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

@@ -18,11 +18,10 @@ def app_environment(
     app_environment: EnvVarsDict,
     external_envfile_dict: EnvVarsDict,
 ) -> EnvVarsDict:
-    """
-    NOTE: To run against repo.config in osparc-config repo
+    """OVERRIDES app_environment fixture:
 
-    ln -s /path/to/osparc-config/deployments/mydeploy.com/repo.config .secrets
-    pytest --external-envfile=.secrets tests/unit/test_core_settings.py
+    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)

services/director/tests/unit/test_core_settings.py

@@ -9,14 +9,35 @@
 import pytest
 from pydantic import ValidationError
 from pytest_simcore.helpers.monkeypatch_envs import (
+    delenvs_from_dict,
     setenvs_from_dict,
     setenvs_from_envfile,
 )
 from pytest_simcore.helpers.typing_env import EnvVarsDict
 from simcore_service_director.core.settings import ApplicationSettings
 
 
-def test_valid_web_application_settings(app_environment: EnvVarsDict):
+@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):
     """
     We validate actual envfiles (e.g. repo.config files) by passing them via the CLI