NRL-2140 Always use smoke_test_params ods_code for sandbox smoke tests

mattdean3-nhs · mattdean3-nhs · commit d1b586dc070e · 2026-04-14T19:01:46.000+01:00
diff --git a/tests/smoke/scenarios/1dsync_upsert_delete.py b/tests/smoke/scenarios/1dsync_upsert_delete.py
@@ -15,7 +15,8 @@ def producer_client_1dsync(
     if environment_config.connect_mode == ConnectMode.INTERNAL.value:
         custom_smoke_test_parameters.nrlf_app_id = "SMOKETEST1DSYNC"
 
-    custom_smoke_test_parameters.ods_code = "SMOKETEST1DSYNC"
+    if environment_config.env_name not in ["dev-sandbox", "qa-sandbox", "int-sandbox"]:
+        custom_smoke_test_parameters.ods_code = "SMOKETEST1DSYNC"
 
     client_config = environment_config.to_client_config(custom_smoke_test_parameters)
 
diff --git a/tests/smoke/scenarios/consumer_search_read_v1.py b/tests/smoke/scenarios/consumer_search_read_v1.py
@@ -2,7 +2,7 @@
 
 import pytest
 
-from tests.smoke.environment import SmokeTestParameters
+from tests.smoke.environment import EnvironmentConfig, SmokeTestParameters
 from tests.smoke.setup import build_document_reference, upsert_test_pointer
 from tests.utilities.api_clients import ConsumerTestClient, ProducerTestClient
 
@@ -12,8 +12,16 @@ def test_data_v1(
     test_nhs_numbers: list[str],
     producer_client_v1: ProducerTestClient,
     smoke_test_parameters: SmokeTestParameters,
-) -> Generator[str, Any, None]:
-    test_ods_code = smoke_test_parameters.v1_ods_code
+    environment_config: EnvironmentConfig,
+) -> Generator[dict[str, Any], Any, None]:
+    if (
+        environment_config.env_name in ["dev-sandbox", "qa-sandbox", "int-sandbox"]
+        and smoke_test_parameters.ods_code
+    ):
+        test_ods_code = smoke_test_parameters.ods_code
+    else:
+        test_ods_code = smoke_test_parameters.v1_ods_code
+
     test_pointers = [
         upsert_test_pointer(
             f"{test_ods_code}-smoketest_consumer_search_read_pointer_{n}",
diff --git a/tests/smoke/scenarios/producer_crud_v1.py b/tests/smoke/scenarios/producer_crud_v1.py
@@ -1,4 +1,4 @@
-from tests.smoke.environment import SmokeTestParameters
+from tests.smoke.environment import EnvironmentConfig, SmokeTestParameters
 from tests.smoke.setup import build_document_reference
 from tests.utilities.api_clients import ProducerTestClient
 
@@ -7,11 +7,19 @@ def test_smoke_producer_crud_v1(
     producer_client_v1: ProducerTestClient,
     test_nhs_numbers: list[str],
     smoke_test_parameters: SmokeTestParameters,
+    environment_config: EnvironmentConfig,
 ):
     """
     Smoke test scenario for producer CRUD behaviour
     """
-    test_ods_code = smoke_test_parameters.v1_ods_code
+    if (
+        environment_config.env_name in ["dev-sandbox", "qa-sandbox", "int-sandbox"]
+        and smoke_test_parameters.ods_code
+    ):
+        test_ods_code = smoke_test_parameters.ods_code
+    else:
+        test_ods_code = smoke_test_parameters.v1_ods_code
+
     test_docref = build_document_reference(
         nhs_number=test_nhs_numbers[0], custodian=test_ods_code
     )
diff --git a/tests/smoke/scenarios/producer_search_read_v1.py b/tests/smoke/scenarios/producer_search_read_v1.py
@@ -2,7 +2,7 @@
 
 import pytest
 
-from tests.smoke.environment import SmokeTestParameters
+from tests.smoke.environment import EnvironmentConfig, SmokeTestParameters
 from tests.smoke.setup import build_document_reference, upsert_test_pointer
 from tests.utilities.api_clients import ProducerTestClient
 
@@ -12,8 +12,17 @@ def test_data(
     test_nhs_numbers: list[str],
     producer_client_v1: ProducerTestClient,
     smoke_test_parameters: SmokeTestParameters,
-) -> Generator[str, Any, None]:
-    test_ods_code = smoke_test_parameters.v1_ods_code
+    environment_config: EnvironmentConfig,
+) -> Generator[dict[str, Any], Any, None]:
+
+    if (
+        environment_config.env_name in ["dev-sandbox", "qa-sandbox", "int-sandbox"]
+        and smoke_test_parameters.ods_code
+    ):
+        test_ods_code = smoke_test_parameters.ods_code
+    else:
+        test_ods_code = smoke_test_parameters.v1_ods_code
+
     test_pointers = [
         upsert_test_pointer(
             f"{test_ods_code}-smoketest_producer_count_search_read_pointer_{n}",
