rename skip_if_external_envfile_dict to skip_if_no_external_envfile for clarity in multiple test files

Author: pcrespov

packages/pytest-simcore/src/pytest_simcore/environment_configs.py

@@ -79,7 +79,7 @@ def external_envfile_dict(
 
 
 @pytest.fixture(scope="session")
-def skip_if_external_envfile_dict(external_envfile_dict: EnvVarsDict) -> None:
+def skip_if_no_external_envfile(external_envfile_dict: EnvVarsDict) -> None:
     if not external_envfile_dict:
         pytest.skip(reason="Skipping test since external-envfile is not set")
 

services/autoscaling/tests/unit/test_modules_auto_scaling_dynamic.py

@@ -1069,7 +1069,7 @@ async def test_cluster_scaling_up_and_down(
     ],
 )
 async def test_cluster_scaling_up_and_down_against_aws(
-    skip_if_external_envfile_dict: None,
+    skip_if_no_external_envfile: None,
     external_ec2_instances_allowed_types: None | dict[str, EC2InstanceBootSpecific],
     with_labelize_drain_nodes: EnvVarsDict,
     app_with_docker_join_drained: EnvVarsDict,

services/autoscaling/tests/unit/test_modules_buffer_machine_core.py

@@ -532,7 +532,7 @@ def pre_pull_images(
 
 
 async def test_monitor_buffer_machines_against_aws(
-    skip_if_external_envfile_dict: None,
+    skip_if_no_external_envfile: None,
     disable_buffers_pool_background_task: None,
     disable_autoscaling_background_task: None,
     disabled_rabbitmq: None,

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

@@ -2,35 +2,12 @@
 # pylint: disable=unused-argument
 # pylint: disable=redefined-outer-name
 
-import pytest
 from pytest_simcore.helpers.monkeypatch_envs import (
     EnvVarsDict,
-    delenvs_from_dict,
-    setenvs_from_dict,
 )
 from simcore_service_datcore_adapter.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/director/tests/unit/test_registry_proxy.py

@@ -278,7 +278,7 @@ def configure_number_concurrency_calls(
 
 
 def test_list_services_performance(
-    skip_if_external_envfile_dict: None,
+    skip_if_no_external_envfile: None,
     configure_external_registry_access: EnvVarsDict,
     configure_number_concurrency_calls: EnvVarsDict,
     registry_settings: RegistrySettings,