refactor: enhance app_environment fixture to include docker compose service environment

Author: pcrespov

services/web/server/tests/unit/with_dbs/03/conftest.py

@@ -28,14 +28,17 @@ async def drop_all_preferences(
 def app_environment(
     monkeypatch: pytest.MonkeyPatch,
     app_environment: EnvVarsDict,
+    docker_compose_service_environment_dict: EnvVarsDict,
 ) -> EnvVarsDict:
     return app_environment | setenvs_from_dict(
         monkeypatch,
         {
+            **docker_compose_service_environment_dict,
             # disable tracing  for tests
             "TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT": "null",
             "TRACING_OPENTELEMETRY_COLLECTOR_PORT": "null",
             "WEBSERVER_TRACING": "null",
+            "WEBSERVER_RPC_NAMESPACE": "null",
         },
     )
 

services/web/server/tests/unit/with_dbs/03/test__openapi_specs.py

@@ -27,15 +27,18 @@ def openapi_specs_path(api_version_prefix: str) -> Path:
 @pytest.fixture
 def app_environment(
     mock_env_devel_environment: EnvVarsDict,
+    docker_compose_service_environment_dict: EnvVarsDict,
     monkeypatch: pytest.MonkeyPatch,
     faker: Faker,
 ) -> EnvVarsDict:
     # Needed to enable  WEBSERVER_ACTIVITY using PROMETEUS below
     monkeypatch.delenv("WEBSERVER_ACTIVITY", raising=False)
+    docker_compose_service_environment_dict.pop("WEBSERVER_ACTIVITY", None)
 
     return mock_env_devel_environment | setenvs_from_dict(
         monkeypatch,
         {
+            **docker_compose_service_environment_dict,
             # disable bundle configs
             "WEBSERVER_DB_LISTENER": "0",
             "WEBSERVER_GARBAGE_COLLECTOR": "null",

services/web/server/tests/unit/with_dbs/03/test_session_access_policies.py

@@ -31,7 +31,7 @@
 @pytest.fixture
 async def client(
     aiohttp_client: Callable,
-    mock_webserver_service_environment: EnvVarsDict,
+    app_environment: EnvVarsDict,
 ) -> TestClient:
     routes = web.RouteTableDef()