Tests pass. Async-ly

Author: nhsdevws

e2e_batch/test_e2e_batch.py

@@ -10,6 +10,8 @@
     poll_destination,
     DestinationType,
 )
+import logging
+
 
 from constants import (
     SOURCE_BUCKET,
@@ -25,21 +27,26 @@
 
 seed_datas = [
     TestData("Create", "V0V8L", [CREATE]),
-    # TestData("Update", "8HK48", [CREATE, UPDATE]),
-    # TestData("Delete", "8HA94", [CREATE, UPDATE, DELETE]),
-    # TestData("Reinstate", "X26", [CREATE, DELETE, UPDATE]),
+    TestData("Update", "8HK48", [CREATE, UPDATE]),
+    TestData("Delete", "8HA94", [CREATE, UPDATE, DELETE]),
+    TestData("Reinstate", "X26", [CREATE, DELETE, UPDATE]),
     # TestData("Update-Reinstate", "X8E5B", [CREATE, DELETE, UPDATE, UPDATE]),
     # TestData("Update-No Create", "YGM41", [UPDATE], success=False),
     # TestData("Delete-No Create", "YGJ", [DELETE], success=False),
     # TestData("Create with extended ascii characters in name", "YGA", [CREATE], inject_char=True),
 ]
 
+logging.basicConfig(level="INFO")
+logger = logging.getLogger()
+logger.setLevel("INFO")
+
 
 class TestE2EBatch(unittest.TestCase):
 
     @unittest.skipIf(environment == "ref", "Skip for ref")
     def test_create_success(self):
         """Test CREATE scenario."""
+        start_time = time.time()
         max_timeout = 1200  # seconds
 
         test_datas: list[TestData] = generate_csv_files(seed_datas)
@@ -62,17 +69,25 @@ def test_create_success(self):
                         found_ack_key = poll_destination(test_data.file_name, ack_key)
                         if found_ack_key:
                             test_data.ack_keys[ack_key] = found_ack_key
+                            logging.info(f"Found {ack_key} ack for {test_data.file_name}: {found_ack_key}")
                         else:
                             pending = True
             if pending:
                 time.sleep(1)
 
+        logging.info(f"Finished polling for acks. Time taken: {time.time() - start_time:.1f} seconds")
+
         # Now validate all files have been processed correctly
         for test_data in test_datas:
             # Validate the ACK file
             inf_ack_content = get_file_content_from_s3(ACK_BUCKET, test_data.ack_keys[DestinationType.INF])
-            bus_ack_content = get_file_content_from_s3(ACK_BUCKET, test_data.ack_keys[DestinationType.BUS])
 
             check_ack_file_content(inf_ack_content, "Success", None, test_data.actions)
             validate_row_count(test_data.file_name, test_data.ack_keys[DestinationType.BUS])
+            # check row after header
+
             # how to validate bus ack content?
+            # bus_ack_content = get_file_content_from_s3(ACK_BUCKET, test_data.ack_keys[DestinationType.BUS])
+
+        logging.info(f"Completed all validations. Total time taken: {time.time() - start_time:.1f} seconds")
+

e2e_batch/utils.py

@@ -526,8 +526,6 @@ def verify_final_ack_file(file_key):
 def get_file_name(vax_type, ods, version="5"):
     timestamp = datetime.now(timezone.utc).strftime("%Y%m%dT%H%M%S00")
     # timestamp = timestamp[:-3]
-    if is_valid_datetime(timestamp) is False:
-        print("Timestamp is not valid")
     return f"{vax_type}_Vaccinations_v{version}_{ods}_{timestamp}.csv"
 
 
@@ -549,24 +547,3 @@ def generate_csv_file(seed: TestData, actions: str) -> str:
     file_name = get_file_name(seed.vax, seed.ods, seed.version)
     df.to_csv(file_name, index=False, sep="|", quoting=csv.QUOTE_MINIMAL)
     return file_name
-
-
-def is_valid_datetime(timestamp: str) -> bool:
-    """
-    Returns a bool to indicate whether the timestamp is a valid datetime in the format 'YYYYmmddTHHMMSSzz'
-    where 'zz' is a two digit number indicating the timezone
-    """
-    # Check that datetime (excluding timezone) is a valid datetime in the expected format.
-    print(f"Validating timestamp: {timestamp}")
-    if len(timestamp) < 15:
-        print("Timestamp is too short")
-        return False
-
-    # Note that any digits after the seconds (i.e. from the 16th character onwards, usually expected to represent
-    # timezone), do not need to be validated
-    try:
-        datetime.strptime(timestamp[:15], "%Y%m%dT%H%M%S")
-    except ValueError:
-        return False
-
-    return True