Changing the last run util to check for enviroment first, then test name.

Author: adrianoaru-nhs

tests/regression/subject/episodes/datasets/investigation/endoscopy/polypcategories/test_setup.py

@@ -87,7 +87,6 @@ def before_each(page: Page, request: FixtureRequest) -> None:
         setup_appointments(page)
 
 
-@pytest.mark.wip
 def test_setup_subjects_as_a99(page: Page, subjects_to_run_for: int) -> None:
     """
     Scenario Outline: Set up 10 subjects to be at status A99

utils/last_test_run.py

@@ -12,7 +12,7 @@ def load_last_run_data() -> Dict[str, Any]:
     Loads the last run data from the JSON file.
 
     Returns:
-        Dict[str, Any]: A dictionary mapping test names to their last run date.
+        Dict[str, Any]: A dictionary mapping environments to test names and their last run date.
     """
     if os.path.exists(LAST_RUN_FILE):
         try:
@@ -31,31 +31,39 @@ def save_last_run_data(data: Dict[str, Any]) -> None:
     Saves the last run data to the JSON file.
 
     Args:
-        data (Dict[str, Any]): The data to save, mapping test names to their last run date.
+        data (Dict[str, Any]): The data to save, mapping environments to test names and their last run date.
     """
     with open(LAST_RUN_FILE, "w") as f:
         json.dump(data, f, indent=2)
 
 
 def has_test_run_today(test_name: str, base_url: Optional[str] = None) -> bool:
     """
-    Checks if the given test has already run today.
-    If not, updates the record to mark it as run today.
+    Checks if the given test has already run today in the given environment.
+    If not, updates the record to mark it as run today for that environment.
 
     Args:
         test_name (str): The name of the test to check.
+        base_url (str, optional): The environment base URL.
 
     Returns:
-        bool: True if the test has already run today, False otherwise.
+        bool: True if the test has already run today in this environment, False otherwise.
     """
     data = load_last_run_data()
     today = date.today().isoformat()
     env = base_url or "unknown"
 
-    last_run = data.get(test_name, {})
-    if last_run.get("date") == today and last_run.get("env") == env:
+    # Ensure the environment key exists
+    env_data = data.get(env, {})
+
+    # Check if the test has run today in this environment
+    last_run = env_data.get(test_name, {})
+    if last_run.get("date") == today:
         return True
     else:
-        data[test_name] = {"date": today, "env": env}
+        # Update only the relevant environment/test combination
+        if env not in data:
+            data[env] = {}
+        data[env][test_name] = {"date": today}
         save_last_run_data(data)
         return False