From f6b7acc1ced6084ad340904ed8de892e3abbb96d Mon Sep 17 00:00:00 2001 From: damientobin1 Date: Fri, 10 Apr 2026 22:50:59 +0100 Subject: [PATCH 1/3] Revert "CCM-14195: Updating tests" This reverts commit 8412b7c2ef69d81c8de2f52891804f4f8cf1be50. --- helpers/constants.py | 2 +- tests/release_tests/test_parallel_send_sms.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/helpers/constants.py b/helpers/constants.py index 6bc2f08..f3c29c4 100644 --- a/helpers/constants.py +++ b/helpers/constants.py @@ -27,7 +27,7 @@ def get_client() -> str: GLOBAL_ROUTING_CONFIGURATION_NHSAPP_EMAIL="00000000-0000-0000-0000-000000000004" MESH_ROUTING_CONFIGURATION_ALL_CHANNELS_CASCADE="1962c467-0000-0000-0000-3fa5cee00391" API_ROUTING_CONFIGURATION_ALL_CHANNELS_CASCADE="1962c467-0000-0000-0000-3fa5cee00392" -PARALLEL_SEND_ROUTING_CONFIGURATION_SMS="1962c467-0000-0000-0000-3fa5cee00394" +PARALLEL_SEND_ROUTING_CONFIGURATION="1962c467-0000-0000-0000-3fa5cee00394" PARALLEL_SEND_ROUTING_CONFIGURATION_EMAIL="1962c467-0000-0000-0000-3fa5cee00372" PATH_TO_EVIDENCE = "tests/evidence" diff --git a/tests/release_tests/test_parallel_send_sms.py b/tests/release_tests/test_parallel_send_sms.py index 65c52b0..2035118 100644 --- a/tests/release_tests/test_parallel_send_sms.py +++ b/tests/release_tests/test_parallel_send_sms.py @@ -1,5 +1,5 @@ import uuid -from helpers.constants import NHS_NUMBER_NHSAPP, PARALLEL_SEND_ROUTING_CONFIGURATION_SMS +from helpers.constants import NHS_NUMBER_NHSAPP, PARALLEL_SEND_ROUTING_CONFIGURATION from helpers.api.apim_request import APIHelper from helpers.aws.aws_client import AWSClient from helpers.test_data.user_data import UserData @@ -12,7 +12,7 @@ def test_parallel_send(api_client): user = [ UserData( - routing_plan_id=PARALLEL_SEND_ROUTING_CONFIGURATION_SMS, + routing_plan_id=PARALLEL_SEND_ROUTING_CONFIGURATION, nhs_number = NHS_NUMBER_NHSAPP, # communication_type and supplier are used in enrich test data for GUKN requests communication_type = "SMS", From 0a65512f9bd2ec7364404aacc03e80ddd81f1acd Mon Sep 17 00:00:00 2001 From: damientobin1 Date: Fri, 10 Apr 2026 22:51:01 +0100 Subject: [PATCH 2/3] Revert "CCM-14195: Updating tests" This reverts commit 8a3a3a60cc7a1fc12531467f86df20ab1c9e3219. --- helpers/constants.py | 1 - tests/release_tests/test_parallel_send_email.py | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/helpers/constants.py b/helpers/constants.py index f3c29c4..0f10214 100644 --- a/helpers/constants.py +++ b/helpers/constants.py @@ -28,7 +28,6 @@ def get_client() -> str: MESH_ROUTING_CONFIGURATION_ALL_CHANNELS_CASCADE="1962c467-0000-0000-0000-3fa5cee00391" API_ROUTING_CONFIGURATION_ALL_CHANNELS_CASCADE="1962c467-0000-0000-0000-3fa5cee00392" PARALLEL_SEND_ROUTING_CONFIGURATION="1962c467-0000-0000-0000-3fa5cee00394" -PARALLEL_SEND_ROUTING_CONFIGURATION_EMAIL="1962c467-0000-0000-0000-3fa5cee00372" PATH_TO_EVIDENCE = "tests/evidence" diff --git a/tests/release_tests/test_parallel_send_email.py b/tests/release_tests/test_parallel_send_email.py index 23c7b64..6f1ce45 100644 --- a/tests/release_tests/test_parallel_send_email.py +++ b/tests/release_tests/test_parallel_send_email.py @@ -1,5 +1,5 @@ import uuid -from helpers.constants import NHS_NUMBER_NHSAPP, PARALLEL_SEND_ROUTING_CONFIGURATION_EMAIL +from helpers.constants import NHS_NUMBER_NHSAPP, PARALLEL_SEND_ROUTING_CONFIGURATION from helpers.api.apim_request import APIHelper from helpers.aws.aws_client import AWSClient from helpers.test_data.user_data import UserData @@ -12,7 +12,7 @@ def test_parallel_send(api_client): user = [ UserData( - routing_plan_id=PARALLEL_SEND_ROUTING_CONFIGURATION_EMAIL, + routing_plan_id=PARALLEL_SEND_ROUTING_CONFIGURATION, nhs_number = NHS_NUMBER_NHSAPP, # communication_type and supplier are used in enrich test data for GUKN requests communication_type = "EMAIL", From 3d93cb5e81fadbc502627aa8c4d2bfa50f93b816 Mon Sep 17 00:00:00 2001 From: damientobin1 Date: Fri, 10 Apr 2026 22:51:01 +0100 Subject: [PATCH 3/3] Revert "CCM-14195: Adding respect of the test exit code" This reverts commit 2ad3b06b1f05f91f7555f39b5b3a981232be20e0. --- ...llel_send_sms.py => test_parallel_send.py} | 0 .../release_tests/test_parallel_send_email.py | 34 ------------------- 2 files changed, 34 deletions(-) rename tests/release_tests/{test_parallel_send_sms.py => test_parallel_send.py} (100%) delete mode 100644 tests/release_tests/test_parallel_send_email.py diff --git a/tests/release_tests/test_parallel_send_sms.py b/tests/release_tests/test_parallel_send.py similarity index 100% rename from tests/release_tests/test_parallel_send_sms.py rename to tests/release_tests/test_parallel_send.py diff --git a/tests/release_tests/test_parallel_send_email.py b/tests/release_tests/test_parallel_send_email.py deleted file mode 100644 index 6f1ce45..0000000 --- a/tests/release_tests/test_parallel_send_email.py +++ /dev/null @@ -1,34 +0,0 @@ -import uuid -from helpers.constants import NHS_NUMBER_NHSAPP, PARALLEL_SEND_ROUTING_CONFIGURATION -from helpers.api.apim_request import APIHelper -from helpers.aws.aws_client import AWSClient -from helpers.test_data.user_data import UserData -from helpers.ui import nhs_app_journey -from helpers.api.govuk_notify import verify_email_content - -def test_parallel_send(api_client): - api_helper = APIHelper(api_client) - aws_client = AWSClient() - - user = [ - UserData( - routing_plan_id=PARALLEL_SEND_ROUTING_CONFIGURATION, - nhs_number = NHS_NUMBER_NHSAPP, - # communication_type and supplier are used in enrich test data for GUKN requests - communication_type = "EMAIL", - supplier = "GOVUK_NOTIFY", - message_reference= str(uuid.uuid1()), - personalisation = "Parallel Send" - ) - ] - - body = api_helper.construct_single_message_body(user[0]) - api_helper.send_and_verify_single_message_request(body, user[0]) - - nhs_app_journey.nhs_app_login_and_view_message(personalisation=user[0].personalisation) - - UserData.enrich_test_data(aws_client, user) - - verify_email_content(user[0]) - - api_helper.poll_for_message_status(user[0].request_item, "delivered") \ No newline at end of file