rm external_envfile_dict

Author: pcrespov

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

@@ -3,35 +3,12 @@
 # pylint: disable=redefined-outer-name
 
 
-import pytest
 from pytest_simcore.helpers.monkeypatch_envs import (
     EnvVarsDict,
-    delenvs_from_dict,
-    setenvs_from_dict,
 )
 from simcore_service_api_server.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
 

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

@@ -11,7 +11,6 @@
 from pydantic import ValidationError
 from pytest_simcore.helpers.monkeypatch_envs import (
     EnvVarsDict,
-    delenvs_from_dict,
     setenvs_from_dict,
 )
 from simcore_service_clusters_keeper.core.settings import ApplicationSettings
@@ -118,25 +117,10 @@ def test_valid_primary_custom_tags(
 
 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
-
-    """
-
     # Mock
     assert app_environment
-    if external_envfile_dict:
-        delenvs_from_dict(monkeypatch, app_environment, raising=False)
-        setenvs_from_dict(
-            monkeypatch,
-            {**external_envfile_dict},
-        )
 
     # Test
     settings = ApplicationSettings()  # type: ignore

services/director/tests/unit/test_core_settings.py

@@ -16,34 +16,13 @@
 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
 
 
-@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):
     settings = ApplicationSettings()  # type: ignore
     assert settings

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

@@ -1,44 +1,14 @@
 # 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