fixing app_environs

Author: pcrespov

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

@@ -28,17 +28,16 @@ async def drop_all_preferences(
 def app_environment(
     monkeypatch: pytest.MonkeyPatch,
     app_environment: EnvVarsDict,
-    docker_compose_service_environment_dict: EnvVarsDict,
+    service_name: str,
 ) -> 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",
+            "WEBSERVER_RPC_NAMESPACE": service_name,
         },
     )
 

services/web/server/tests/unit/with_dbs/04/garbage_collector/conftest.py

@@ -52,20 +52,20 @@ def fast_service_deletion_delay() -> int:
 def app_environment(
     fast_service_deletion_delay: int,
     monkeypatch: pytest.MonkeyPatch,
-    docker_compose_service_environment_dict: EnvVarsDict,
-    env_devel_dict: EnvVarsDict,
+    app_environment: EnvVarsDict,
+    service_name: str,
 ) -> EnvVarsDict:
+    monkeypatch.delenv("WEBSERVER_GARBAGE_COLLECTOR", raising=False)
+    app_environment.pop("WEBSERVER_GARBAGE_COLLECTOR", None)
 
-    return setenvs_from_dict(
+    return app_environment | setenvs_from_dict(
         monkeypatch,
         {
-            **docker_compose_service_environment_dict,
             "WEBSERVER_COMPUTATION": "1",
             "WEBSERVER_NOTIFICATIONS": "1",
             # sets TTL of a resource after logout
             "RESOURCE_MANAGER_RESOURCE_TTL_S": f"{fast_service_deletion_delay}",
-            #  "WEBSERVER_PROJECTS must be enabled for close_project fixture"
-            "WEBSERVER_PROJECTS": env_devel_dict["WEBSERVER_PROJECTS"],
+            "WEBSERVER_RPC_NAMESPACE": service_name,
         },
     )