refactor: update environment mock fixtures and add WEBSERVER_RPC_NAMESPACE

Author: pcrespov

services/web/server/tests/unit/isolated/conftest.py

@@ -101,13 +101,14 @@ def mock_env_deployer_pipeline(monkeypatch: pytest.MonkeyPatch) -> EnvVarsDict:
 
 @pytest.fixture
 def mock_env_devel_environment(
-    mock_env_devel_environment: EnvVarsDict,  # pylint: disable=redefined-outer-name
+    env_devel_dict: EnvVarsDict,
     monkeypatch: pytest.MonkeyPatch,
 ) -> EnvVarsDict:
     # Overrides to ensure dev-features are enabled testings
-    return mock_env_devel_environment | setenvs_from_dict(
+    return setenvs_from_dict(
         monkeypatch,
         envs={
+            **env_devel_dict,
             "WEBSERVER_DEV_FEATURES_ENABLED": "1",
             "TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT": "null",
             "TRACING_OPENTELEMETRY_COLLECTOR_PORT": "null",
@@ -184,10 +185,9 @@ def mock_env_dockerfile_build(monkeypatch: pytest.MonkeyPatch) -> EnvVarsDict:
 def mock_webserver_service_environment(
     monkeypatch: pytest.MonkeyPatch,
     mock_env_makefile: EnvVarsDict,
-    mock_env_devel_environment: EnvVarsDict,
     mock_env_dockerfile_build: EnvVarsDict,
     mock_env_deployer_pipeline: EnvVarsDict,
-    mock_webserver_service_environment: EnvVarsDict,
+    docker_compose_service_environment_dict: EnvVarsDict,
     service_name: str,
 ) -> EnvVarsDict:
     """
@@ -232,13 +232,12 @@ def mock_webserver_service_environment(
             "SWARM_STACK_NAME": os.environ.get("SWARM_STACK_NAME", "simcore"),
             "WEBSERVER_LOGLEVEL": os.environ.get("LOG_LEVEL", "WARNING"),
             "SESSION_COOKIE_MAX_AGE": str(7 * 24 * 60 * 60),
-            **mock_webserver_service_environment,
+            **docker_compose_service_environment_dict,
         },
     )
 
     envs = (
         mock_env_makefile
-        | mock_env_devel_environment
         | mock_env_dockerfile_build
         | mock_env_deployer_pipeline
         | mock_envs_docker_compose_environment

services/web/server/tests/unit/isolated/scicrunch/test_scicrunch_service_client.py

@@ -104,7 +104,7 @@ async def mock_scicrunch_service_resolver(
 
 @pytest.fixture
 async def app(
-    mock_env_devel_environment: EnvVarsDict,
+    mock_webserver_service_environment: EnvVarsDict,
     aiohttp_server: Callable,
     mocker: MockerFixture,
 ) -> web.Application:

services/web/server/tests/unit/isolated/test_activity.py

@@ -88,6 +88,7 @@ def app_environment(
             "WEBSERVER_LOGLEVEL": "DEBUG",
             "WEBSERVER_PORT": "8080",
             "WEBSERVER_STUDIES_ACCESS_ENABLED": "True",
+            "WEBSERVER_RPC_NAMESPACE": "null",
         },
     )
 

services/web/server/tests/unit/isolated/test_application_settings.py

@@ -71,8 +71,15 @@ def test_settings_to_client_statics(app_settings: ApplicationSettings):
 
 
 def test_settings_to_client_statics_plugins(
-    mock_webserver_service_environment: EnvVarsDict, monkeypatch: pytest.MonkeyPatch
+    mock_webserver_service_environment: EnvVarsDict,
+    monkeypatch: pytest.MonkeyPatch,
 ):
+    setenvs_from_dict(
+        monkeypatch,
+        {
+            "WEBSERVER_DEV_FEATURES_ENABLED": "1",
+        },
+    )
     monkeypatch.delenv("WEBSERVER_REALTIME_COLLABORATION", raising=False)
 
     # explicitly disable these plugins

services/web/server/tests/unit/isolated/test_application_settings_utils.py

@@ -16,6 +16,6 @@ def test_settings_infered_from_default_tests_config(
         k: f"{v}" for k, v in convert_to_environ_vars(default_app_cfg).items()
     }
 
-    settings = ApplicationSettings.create_from_envs()
+    settings = ApplicationSettings.create_from_envs(WEBSERVER_RPC_NAMESPACE=None)
 
     assert convert_to_app_config(settings)

services/web/server/tests/unit/isolated/test_diagnostics_healthcheck.py

@@ -98,6 +98,7 @@ def mock_environment(
                 }
             ),
             "SC_HEALTHCHECK_TIMEOUT": "2m",
+            "WEBSERVER_RPC_NAMESPACE": "null",
         },
     )