remove VaxSupplierPerms. 600 s timeout. readme

Author: nhsdevws

e2e_batch/README.md

@@ -29,9 +29,10 @@ This test suite provides automated end-to-end (E2E) testing for the Immunisation
 
 ## How to Run
 1. Ensure all dependencies and environment variables are set (see project root README).
-2. Update .`.env` file with contents indicated in `PR-NNN.env`, modified for PR and AWS access credentials
-3. Update the apigee app to match the required PR-NNN
-3. Run tests from vscode debugger or from makefile using 
+2. Update `.env` file with contents indicated in `PR-NNN.env`, modified for PR
+3. Update `.env` with referrence to the appropriate AWS config profile `AWS_PROFILE={your-aws-profile}`
+4. Update the apigee app to match the required PR-NNN
+5. Run tests from vscode debugger or from makefile using 
 ```
 make test
 ```

e2e_batch/test_e2e_batch.py

@@ -46,7 +46,7 @@ def tearDown(self):
     def test_batch_submission(self):
         """Test all scenarios and submit as batch."""
         start_time = time.time()
-        max_timeout = 1200  # seconds
+        max_timeout = 600  # seconds
 
         send_files(self.tests)
 

e2e_batch/utils.py

@@ -73,7 +73,7 @@ def delete_file_from_s3(bucket, key):
         raise Exception(f"Unexpected error during file deletion: {e}")
 
 
-def wait_for_ack_file(ack_prefix, input_file_name, timeout=1200):
+def wait_for_ack_file(ack_prefix, input_file_name, timeout=600):
     """Poll the ACK_BUCKET for an ack file that contains the input_file_name as a substring."""
 
     filename_without_ext = input_file_name[:-4] if input_file_name.endswith(".csv") else input_file_name

e2e_batch/vax_suppliers.py

@@ -1,10 +1,3 @@
-class VaxSupplierPerms:
-    def __init__(self, ods_code, vax, permissions):
-        self.ods_code = ods_code
-        self.vax = vax
-        self.permissions = permissions
-
-
 # json to represent the classes below
 suppliers = {
     "DPSFULL": {