fix broken tests and reduce wait time for no msn event

Author: FimranNHS

tests/e2e_automation/features/APITests/steps/common_steps.py

@@ -376,14 +376,26 @@ def mns_event_will_be_triggered_with_correct_data_for_created_event(context):
 
 @then("MNS event will not be triggered for the event")
 def mns_event_will_not_be_triggered_for_the_event(context):
-    message_body = read_message(context, queue_type="notification", action="CREATE")
+    message_body = read_message(
+        context,
+        queue_type="notification",
+        action="CREATE",
+        wait_time_seconds=5,
+        max_empty_polls=1,
+    )
     print("No MNS create event is created")
     assert message_body is None, "Not expected a message but queue returned a message"
 
 
 @then("MNS event will not be triggered for the update event")
 def validate_mns_event_not_triggered_for_updated_event(context):
-    message_body = read_message(context, queue_type="notification", action="UPDATE")
+    message_body = read_message(
+        context,
+        queue_type="notification",
+        action="UPDATE",
+        wait_time_seconds=5,
+        max_empty_polls=3,
+    )
     print("no MNS update event is created")
     assert message_body is None, "Not expected a message but queue returned a message"
 
@@ -483,7 +495,13 @@ def validate_sqs_message(context, message_body, action):
 
 def mns_event_will_be_triggered_with_correct_data_for_deleted_event(context):
     if context.patient.identifier[0].value is None:
-        message_body = read_message(context, queue_type="notification", action="DELETE")
+        message_body = read_message(
+            context,
+            queue_type="notification",
+            action="DELETE",
+            wait_time_seconds=5,
+            max_empty_polls=3,
+        )
         print(
             "No MNS delete event is created as expected since NHS number is not present in the original immunization event"
         )

tests/e2e_automation/utilities/api_fhir_immunization_helper.py

@@ -242,7 +242,7 @@ def validate_to_compare_request_and_response(context, create_obj, created_event,
             (
                 "patient.identifier.value",
                 (request_patient.identifier[0].value if context.patient.identifier[0].value is not None else ""),
-                response_patient.identifier.value,
+                (response_patient.identifier.value if response_patient.identifier.value is not None else ""),
             )
         )
         fields_to_compare.append(

tests/e2e_automation/utilities/sqs_message_halder.py

@@ -26,22 +26,22 @@ def read_message(
     action="CREATE",
     wait_for_message=True,
     max_empty_polls=3,
+    wait_time_seconds=20,
 ):
     sqs = boto3.client("sqs", region_name="eu-west-2")
     queue_url = build_queue_url(context.S3_env, context.aws_account_id, queue_type)
 
     expected_dataref = f"{context.url}/{context.ImmsID}"
 
-    WAIT_TIME_SECONDS = 20
     empty_polls = 0
 
     while True:
-        print(f"Polling {queue_type} queue for {action} messages (wait {WAIT_TIME_SECONDS}s)...")
+        print(f"Polling {queue_type} queue for {action} messages (wait {wait_time_seconds}s)...")
 
         response = sqs.receive_message(
             QueueUrl=queue_url,
             MaxNumberOfMessages=10,
-            WaitTimeSeconds=WAIT_TIME_SECONDS,
+            WaitTimeSeconds=wait_time_seconds,
             VisibilityTimeout=30,
         )