fix envvar

Author: giancarloromeo

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

@@ -96,12 +96,31 @@ def mock_env_deployer_pipeline(monkeypatch: pytest.MonkeyPatch) -> EnvVarsDict:
 def mock_env_devel_environment(
     mock_env_devel_environment: EnvVarsDict,  # pylint: disable=redefined-outer-name
     monkeypatch: pytest.MonkeyPatch,
+    faker: Faker
 ) -> EnvVarsDict:
     # Overrides to ensure dev-features are enabled testings
     return mock_env_devel_environment | setenvs_from_dict(
         monkeypatch,
         envs={
             "WEBSERVER_DEV_FEATURES_ENABLED": "1",
+            "WEBSERVER_EMAIL": json.dumps({
+                "SMTP_HOST": faker.url(),
+                "SMTP_PORT": faker.port_number()
+            }),
+            "WEBSERVER_LOGIN": json.dumps({
+                "LOGIN_REGISTRATION_INVITATION_REQUIRED": True
+            }),
+            "WEBSERVER_PAYMENTS": json.dumps({
+                "PAYMENTS_USERNAME": faker.user_name(),
+                "PAYMENTS_PASSWORD": faker.password()
+            }),
+            "WEBSERVER_SCICRUNCH": json.dumps({
+                "SCICRUNCH_API_KEY": faker.pystr()
+            }),
+            "WEBSERVER_TRACING": json.dumps({
+                "TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT": faker.url(),
+                "TRACING_OPENTELEMETRY_COLLECTOR_PORT": faker.port_number()
+            })
         },
     )
 
@@ -178,7 +197,6 @@ def mock_webserver_service_environment(
     mock_env_devel_environment: EnvVarsDict,  # pylint: disable=redefined-outer-name
     mock_env_dockerfile_build: EnvVarsDict,  # pylint: disable=redefined-outer-name
     mock_env_deployer_pipeline: EnvVarsDict,  # pylint: disable=redefined-outer-name
-    faker: Faker
 ) -> EnvVarsDict:
     """
     Mocks environment produce in the docker compose config with a .env (.env-devel)
@@ -219,26 +237,8 @@ def mock_webserver_service_environment(
             "STORAGE_PORT": os.environ.get("STORAGE_PORT", "8080"),
             "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),
-            "WEBSERVER_EMAIL": json.dumps({
-                "SMTP_HOST": faker.url(),
-                "SMTP_PORT": faker.port_number()
-            }),
-            "WEBSERVER_LOGIN": json.dumps({
-                "LOGIN_REGISTRATION_INVITATION_REQUIRED": True
-            }),
-            "WEBSERVER_PAYMENTS": json.dumps({
-                "PAYMENTS_USERNAME": faker.user_name(),
-                "PAYMENTS_PASSWORD": faker.password()
-            }),
-            "WEBSERVER_SCICRUNCH": json.dumps({
-                "SCICRUNCH_API_KEY": faker.pystr()
-            }),
-            "WEBSERVER_TRACING": json.dumps({
-                "TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT": faker.url(),
-                "TRACING_OPENTELEMETRY_COLLECTOR_PORT": faker.port_number()
-            })
-        },
+            "SESSION_COOKIE_MAX_AGE": str(7 * 24 * 60 * 60)
+        }
     )
 
     return (