Changed util to account for environment used

Author: adrianoaru-nhs

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

@@ -1,6 +1,7 @@
 from datetime import datetime, timedelta
 import pandas as pd
 import pytest
+from _pytest.fixtures import FixtureRequest
 import logging
 from playwright.sync_api import Page
 from classes.subject import Subject
@@ -62,7 +63,9 @@
 from utils.user_tools import UserTools
 
 
-def test_setup_subjects_as_a99(page: Page, subjects_to_run_for: int) -> None:
+def test_setup_subjects_as_a99(
+    page: Page, subjects_to_run_for: int, request: FixtureRequest
+) -> None:
     """
     Scenario Outline: Set up 10 subjects to be at status A99
     """
@@ -76,8 +79,9 @@ def test_setup_subjects_as_a99(page: Page, subjects_to_run_for: int) -> None:
     if not param_29_set_correctly:
         set_org_parameter_value(29, "20:00", "23162")
 
+    base_url = request.config.getoption("--base-url")
     if not has_test_run_today(
-        "subject/episodes/datasets/investigation/endoscopy/polypcategories/test_setup"
+        "subject/episodes/datasets/investigation/endoscopy/polypcategories/test_setup", base_url  # type: ignore
     ):
         setup_appointments(page)
         page = page.context.new_page()
@@ -106,7 +110,9 @@ def test_setup_subjects_as_a99(page: Page, subjects_to_run_for: int) -> None:
     LogoutPage(page).log_out()
 
 
-def test_setup_subjects_as_a259(page: Page, subjects_to_run_for: int) -> None:
+def test_setup_subjects_as_a259(
+    page: Page, subjects_to_run_for: int, request: FixtureRequest
+) -> None:
     """
     Set up 10 subjects to have new Colonoscopy datasets in episodes started within in the last 4 years
     """
@@ -120,8 +126,9 @@ def test_setup_subjects_as_a259(page: Page, subjects_to_run_for: int) -> None:
     if not param_29_set_correctly:
         set_org_parameter_value(29, "20:00", "23162")
 
+    base_url = request.config.getoption("--base-url")
     if not has_test_run_today(
-        "subject/episodes/datasets/investigation/endoscopy/polypcategories/test_setup"
+        "subject/episodes/datasets/investigation/endoscopy/polypcategories/test_setup", base_url  # type: ignore
     ):
         setup_appointments(page)
         page = page.context.new_page()

utils/last_test_run.py

@@ -1,10 +1,10 @@
 import os
 import json
 from datetime import date
-from typing import Dict, Any
-import pytest
+from typing import Dict, Any, Optional
 
-LAST_RUN_FILE = "./.test_last_runs.json"
+PROJECT_ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))
+LAST_RUN_FILE = os.path.join(PROJECT_ROOT, ".test_last_runs.json")
 
 
 def load_last_run_data() -> Dict[str, Any]:
@@ -37,7 +37,7 @@ def save_last_run_data(data: Dict[str, Any]) -> None:
         json.dump(data, f, indent=2)
 
 
-def has_test_run_today(test_name: str) -> bool:
+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.
@@ -50,10 +50,12 @@ def has_test_run_today(test_name: str) -> bool:
     """
     data = load_last_run_data()
     today = date.today().isoformat()
+    env = base_url or "unknown"
 
-    if data.get(test_name) == today:
+    last_run = data.get(test_name, {})
+    if last_run.get("date") == today and last_run.get("env") == env:
         return True
     else:
-        data[test_name] = today
+        data[test_name] = {"date": today, "env": env}
         save_last_run_data(data)
         return False