WiP

Author: nhsdevws

e2e_batch/Makefile

@@ -2,17 +2,17 @@
 
 APIGEE_ACCESS_TOKEN ?= $(shell export SSO_LOGIN_URL=https://login.apigee.com && eval get_token -u $(APIGEE_USERNAME))
 AWS_DOMAIN_NAME=https://$(shell make -C ../terraform -s output name=service_domain_name || true)
-PARALLEL_WORKERS=1
+PARALLEL_WORKERS=2
 
 print-token:
 	@echo "APIGEE_ACCESS_TOKEN=$(APIGEE_ACCESS_TOKEN)"
 
 
 run-immunization-batch:
-	ENVIRONMENT=$(environment) poetry run python -m unittest -v -c
+	ENVIRONMENT=$(ENVIRONMENT) poetry run python -m unittest -v -c
 
 test:
-	ENVIRONMENT=$(environment) poetry run python -m unittest -v -c
+	ENVIRONMENT=$(ENVIRONMENT) time poetry run python -m unittest -v -c
 
 testp1:
 	ENVIRONMENT=$(ENVIRONMENT) time poetry run unittest-parallel -v -j $(PARALLEL_WORKERS)

e2e_batch/e2e_batch_base.py

@@ -5,17 +5,33 @@
 logger = logging.getLogger("PERFORMANCE")
 logger.setLevel("INFO")
 
-marker = {}
+test_marker = {}
+std_marker = {}
 
 
-def monitor(nameMarker):
+def dump_stats(marker):
+    total = 0
+
+    for name, start_time in marker.items():
+        duration = time.perf_counter_ns() - start_time
+        elapsed_s = duration / 1_000_000_000
+        total += elapsed_s
+        logger.info(f"end [{name}]: {elapsed_s:.3f} s")
+    logger.info(f"total: {total:.3f} s | average: {total / len(marker):.3f} s")
+
+
+def monitor(nameMarker, is_test=True):
     t = time.perf_counter_ns()
+    marker = test_marker if is_test else std_marker
+
     if nameMarker in marker:
         duration = t - marker[nameMarker]
         elapsed_ms = duration / 1_000_000
-        logger.info(f"end [{nameMarker}]: {elapsed_ms} ms")
-
+        elapsed_s = elapsed_ms / 1000
+        logger.info(f"end [{nameMarker}]: {elapsed_s:.3f} s")
+        if is_test:
+            dump_stats(marker)
         del marker[nameMarker]  # <-- remove the marker after logging
     else:
         logger.info(f"start [{nameMarker}]")
-        marker[nameMarker] = t
+    marker[nameMarker] = t

e2e_batch/per_test.py

@@ -1,4 +1,3 @@
-import time
 import unittest
 from utils import (
     generate_csv,
@@ -7,9 +6,6 @@
     wait_for_ack_file,
     check_ack_file_content,
     validate_row_count,
-    upload_config_file,
-    generate_csv_with_ordered_100000_rows,
-    verify_final_ack_file,
     delete_file_from_s3
 )
 from per_test import monitor
@@ -18,10 +14,7 @@
     SOURCE_BUCKET,
     INPUT_PREFIX,
     ACK_BUCKET,
-    PRE_VALIDATION_ERROR,
-    POST_VALIDATION_ERROR,
     DUPLICATE,
-    FILE_NAME_VAL_ERROR,
     environment
 )
 
@@ -32,10 +25,16 @@ def setUp(self):
         self.ack_files = []       # Tracks ack keys
 
     def tearDown(self):
+        # get name of unit test
+        unit_test_name = self._testMethodName
+        marker = f"tearDown-{unit_test_name}"
+
+        monitor(marker, is_test=False)
         for file_key in self.uploaded_files:
             delete_file_from_s3(SOURCE_BUCKET, file_key)
         for ack_key in self.ack_files:
             delete_file_from_s3(ACK_BUCKET, ack_key)
+        monitor(marker, is_test=False)
 
     if environment != "ref":
         def test_create_success(self):
@@ -143,110 +142,3 @@ def test_delete_success(self):
             ack_content = get_file_content_from_s3(ACK_BUCKET, ack_key)
             check_ack_file_content(ack_content, "OK", None, "DELETE")
             monitor("test_delete_success")
-
-        def test_pre_validation_error(self):
-            """Test PRE-VALIDATION error scenario."""
-            monitor("test_pre_validation_error")
-            input_file = generate_csv("PHYLIS", "TRUE", action_flag="CREATE")
-
-            key = upload_file_to_s3(input_file, SOURCE_BUCKET, INPUT_PREFIX)
-            self.uploaded_files.append(key)
-
-            ack_key = wait_for_ack_file(None, input_file)
-            self.ack_files.append(ack_key)
-
-            validate_row_count(input_file, ack_key)
-
-            ack_content = get_file_content_from_s3(ACK_BUCKET, ack_key)
-            check_ack_file_content(ack_content, "Fatal Error", PRE_VALIDATION_ERROR, None)
-            monitor("test_pre_validation_error")
-
-        def test_post_validation_error(self):
-            """Test POST-VALIDATION error scenario."""
-            monitor("test_post_validation_error")
-            input_file = generate_csv("", "0.3", action_flag="CREATE")
-
-            key = upload_file_to_s3(input_file, SOURCE_BUCKET, INPUT_PREFIX)
-            self.uploaded_files.append(key)
-
-            ack_key = wait_for_ack_file(None, input_file)
-            self.ack_files.append(ack_key)
-
-            ack_content = get_file_content_from_s3(ACK_BUCKET, ack_key)
-            check_ack_file_content(ack_content, "Fatal Error", POST_VALIDATION_ERROR, None)
-            monitor("test_post_validation_error")
-
-        def test_file_name_validation_error(self):
-            """Test FILE-NAME-VALIDATION error scenario."""
-            monitor("test_file_name_validation_error")
-            input_file = generate_csv("PHYLIS", "0.3", action_flag="CREATE", file_key=True)
-
-            key = upload_file_to_s3(input_file, SOURCE_BUCKET, INPUT_PREFIX)
-            self.uploaded_files.append(key)
-
-            ack_key = wait_for_ack_file(True, input_file)
-            self.ack_files.append(ack_key)
-
-            ack_content = get_file_content_from_s3(ACK_BUCKET, ack_key)
-            check_ack_file_content(ack_content, "Failure", FILE_NAME_VAL_ERROR, None)
-            monitor("test_file_name_validation_error")
-
-        def test_header_name_validation_error(self):
-            """Test HEADER-NAME-VALIDATION error scenario."""
-            monitor("test_header_name_validation_error")
-            input_file = generate_csv("PHYLIS", "0.3", action_flag="CREATE", headers="NH_NUMBER")
-
-            key = upload_file_to_s3(input_file, SOURCE_BUCKET, INPUT_PREFIX)
-            self.uploaded_files.append(key)
-
-            ack_key = wait_for_ack_file(True, input_file)
-            self.ack_files.append(ack_key)
-
-            ack_content = get_file_content_from_s3(ACK_BUCKET, ack_key)
-            check_ack_file_content(ack_content, "Failure", FILE_NAME_VAL_ERROR, None)
-            monitor("test_header_name_validation_error")
-
-        # This test updates the permissions_config.json file from the imms-internal-dev-supplier-config
-        # S3 bucket shared across multiple environments (PR environments, internal-dev, int, and ref).
-        # Running this may modify permissions in these environments, causing unintended side effects.
-        @unittest.skip("Modifies shared S3 permissions configuration")
-        def test_invalid_permission(self):
-            """Test INVALID-PERMISSION error scenario."""
-            monitor("test_invalid_permission")
-            upload_config_file("MMR_FULL")  # permissions_config.json is updated here
-            time.sleep(20)
-
-            input_file = generate_csv("PHYLIS", "0.3", action_flag="CREATE")
-
-            key = upload_file_to_s3(input_file, SOURCE_BUCKET, INPUT_PREFIX)
-            self.uploaded_files.append(key)
-
-            ack_key = wait_for_ack_file(True, input_file)
-            self.ack_files.append(ack_key)
-
-            ack_content = get_file_content_from_s3(ACK_BUCKET, ack_key)
-            check_ack_file_content(ack_content, "Failure", FILE_NAME_VAL_ERROR, None)
-
-            upload_config_file("COVID19_FULL")
-            time.sleep(20)
-            monitor("test_invalid_permission")
-
-    else:
-        def test_end_to_end_speed_test_with_100000_rows(self):
-            monitor("test_end_to_end_speed_test_with_100000_rows")
-            """Test end_to_end_speed_test_with_100000_rows scenario with full integration"""
-            input_file = generate_csv_with_ordered_100000_rows(None)
-
-            key = upload_file_to_s3(input_file, SOURCE_BUCKET, INPUT_PREFIX)
-            self.uploaded_files.append(key)
-
-            final_ack_key = wait_for_ack_file(None, input_file, timeout=1800)
-            self.ack_files.append(final_ack_key)
-
-            response = verify_final_ack_file(final_ack_key)
-            assert response is True
-            monitor("test_end_to_end_speed_test_with_100000_rows")
-
-
-if __name__ == "__main__":
-    unittest.main()