From cf55aac64bbceb8883cb1a19664fbc763e86da63 Mon Sep 17 00:00:00 2001
From: Khalim Conn-Kowlessar <kconnkowlessar@gmail.com>
Date: Thu, 22 Jan 2026 11:41:58 +0000
Subject: [PATCH] changes pytest config

---
 conftest.py | 55 +++++++++++++++++++++++++----------------------------
 1 file changed, 26 insertions(+), 29 deletions(-)

diff --git a/conftest.py b/conftest.py
index ddd12575..e3add6e6 100644
--- a/conftest.py
+++ b/conftest.py
@@ -1,34 +1,31 @@
-# conftest.py
 import os
-import pytest
 from backend.app.config import get_settings
 
+DEFAULT_ENV = {
+    "API_KEY": "test",
+    "SECRET_KEY": "test",
+    "ENVIRONMENT": "test",
+    "DATA_BUCKET": "test",
+    "PLAN_TRIGGER_BUCKET": "test",
+    "ENGINE_SQS_URL": "test",
+    "EPC_AUTH_TOKEN": "test",  # overridden in GitHub Actions
+    "GOOGLE_SOLAR_API_KEY": "test",
+    "DB_HOST": "localhost",
+    "DB_USERNAME": "test",
+    "DB_PASSWORD": "test",
+    "DB_PORT": "5432",
+    "DB_NAME": "test",
+    "SAP_PREDICTIONS_BUCKET": "test",
+    "CARBON_PREDICTIONS_BUCKET": "test",
+    "HEAT_PREDICTIONS_BUCKET": "test",
+    "HEATING_KWH_PREDICTIONS_BUCKET": "test",
+    "HOTWATER_KWH_PREDICTIONS_BUCKET": "test",
+    "ENERGY_ASSESSMENTS_BUCKET": "test",
+}
 
-@pytest.fixture(autouse=True, scope="session")
-def fake_env():
-    vars = {
-        "API_KEY": "test",
-        "SECRET_KEY": "test",
-        "ENVIRONMENT": "test",
-        "DATA_BUCKET": "test",
-        "PLAN_TRIGGER_BUCKET": "test",
-        "ENGINE_SQS_URL": "test",
-        "EPC_AUTH_TOKEN": "test",  # Will be overwritten in CI/CD
-        "GOOGLE_SOLAR_API_KEY": "test",
-        "DB_HOST": "localhost",
-        "DB_USERNAME": "test",
-        "DB_PASSWORD": "test",
-        "DB_PORT": "5432",
-        "DB_NAME": "test",
-        "SAP_PREDICTIONS_BUCKET": "test",
-        "CARBON_PREDICTIONS_BUCKET": "test",
-        "HEAT_PREDICTIONS_BUCKET": "test",
-        "HEATING_KWH_PREDICTIONS_BUCKET": "test",
-        "HOTWATER_KWH_PREDICTIONS_BUCKET": "test",
-        "ENERGY_ASSESSMENTS_BUCKET": "test",
-    }
+# runs immediately when pytest starts, BEFORE collection
+for k, v in DEFAULT_ENV.items():
+    os.environ.setdefault(k, v)
 
-    for k, v in vars.items():
-        os.environ.setdefault(k, v)
-
-    get_settings.cache_clear()
+# clear cached settings AFTER env is final
+get_settings.cache_clear()