lint

Author: nhsdevws

e2e_batch/constants.py

@@ -79,7 +79,7 @@ def create_row(unique_id, dose_amount, action_flag: ActionFlag, header, inject_c
         "SITE_CODE_TYPE_URI": "https://fhir.nhs.uk/Id/ods-organization-code",
         "UNIQUE_ID": unique_id,
         "UNIQUE_ID_URI": "https://www.ravs.england.nhs.uk/",
-        "ACTION_FLAG": action_flag,
+        "ACTION_FLAG": action_flag if action_flag != "NEW" else "CREATE",  # TODO check if this is needed
         "PERFORMING_PROFESSIONAL_FORENAME": "PHYLIS",
         "PERFORMING_PROFESSIONAL_SURNAME": name,
         "RECORDED_DATE": datetime.now(timezone.utc).strftime("%Y%m%d"),

e2e_batch/test_e2e_batch.py

@@ -60,7 +60,8 @@ def test_create_success(self):
 
         send_files(tests)
 
-        poll_for_responses(tests, max_timeout)
+        if not poll_for_responses(tests, max_timeout):
+            logger.error("Timeout waiting for responses")
 
         validate_responses(tests)
 
@@ -76,19 +77,22 @@ def send_files(tests: list[TestData]):
     logger.info(f"Files uploaded. Time: {time.time() - start_time:.1f} seconds")
 
 
-def poll_for_responses(tests: list[TestData], max_timeout=1200):
+def poll_for_responses(tests: list[TestData], max_timeout=1200) -> bool:
     logger.info("Waiting while processing...")
     start_time = time.time()
     # while there are still pending files, poll for acks and forwarded files
     pending = True
-    while pending and (time.time() - start_time) < max_timeout:
+    while pending:
         pending = False
         for test in tests:
             pending = test.poll_destination(pending)
         if pending:
             print(".", end="")
             time.sleep(5)
+        if (time.time() - start_time) > max_timeout:
+            return False
     logger.info(f"Files processed. Time: {time.time() - start_time:.1f} seconds")
+    return True
 
 
 def validate_responses(tests: list[TestData]):
@@ -117,7 +121,9 @@ def validate_responses(tests: list[TestData]):
                                    test.getOperations())
         else:
             logger.error(f"BUS ACK file not found for test: {test.name}")
+
     if count == expected_count:
-        logger.info(f"Responses validated. Time: {time.time() - start_time:.1f} seconds")
+        logger.info("All responses subject to validation.")
     else:
-        logger.error(f"Only {count} of {expected_count} expected responses found. Time: {time.time() - start_time:.1f} seconds")
+        logger.error(f"{count} of {expected_count} responses subject to validation.")
+    logger.info(f"Time: {time.time() - start_time:.1f} seconds")