VED-372: Tidy up.

Author: mfjarvis

filenameprocessor/tests/test_file_key_validation.py

@@ -17,11 +17,6 @@
 
 class TestFileKeyValidation(TestCase):
     """Tests for file_key_validation functions"""
-    def setUp(self):
-        redis_patcher = patch("clients.redis_client.hkeys", return_value=["FLU", "COVID19", "MMR", "RSV"])
-        self.addCleanup(redis_patcher.stop)
-        redis_patcher.start()
-
     def test_is_valid_datetime(self):
         "Tests that is_valid_datetime returns True for valid datetimes, and false otherwise"
         # Test case tuples are stuctured as (date_time_string, expected_result)
@@ -43,7 +38,8 @@ def test_is_valid_datetime(self):
             with self.subTest():
                 self.assertEqual(is_valid_datetime(date_time_string), expected_result)
 
-    def test_validate_file_key(self):
+    @patch("elasticache.redis_client.hkeys", return_value=["FLU", "RSV"])
+    def test_validate_file_key(self, _mock_hkeys):
         """Tests that file_key_validation returns True if all elements pass validation, and False otherwise"""
         # Test case tuples are structured as (file_key, expected_result)
         test_cases_for_success_scenarios = [
@@ -60,6 +56,7 @@ def test_validate_file_key(self):
         for file_key, expected_result in test_cases_for_success_scenarios:
             with self.subTest(f"SubTest for file key: {file_key}"):
                 self.assertEqual(validate_file_key(file_key), expected_result)
+                _mock_hkeys.assert_called_with("vacc_to_diseases")
 
         key_format_error_message = "Initial file validation failed: invalid file key format"
         invalid_file_key_error_message = "Initial file validation failed: invalid file key"
@@ -105,3 +102,4 @@ def test_validate_file_key(self):
                 with self.assertRaises(InvalidFileKeyError) as context:
                     validate_file_key(file_key)
                 self.assertEqual(str(context.exception), expected_result)
+                _mock_hkeys.assert_called_with("vacc_to_diseases")

filenameprocessor/tests/test_lambda_handler.py

@@ -1,11 +1,12 @@
 """Tests for lambda_handler"""
-import json
 import sys
 from unittest.mock import patch
 from unittest import TestCase
 from json import loads as json_loads
 from contextlib import ExitStack
 from copy import deepcopy
+from constants import VACCINE_TYPE_TO_DISEASES_HASH_KEY
+from elasticache import get_valid_vaccine_types_from_cache
 import fakeredis
 from boto3 import client as boto3_client
 from moto import mock_s3, mock_sqs, mock_firehose, mock_dynamodb
@@ -20,10 +21,6 @@
 from tests.utils_for_tests.mock_environment_variables import MOCK_ENVIRONMENT_DICT, BucketNames, Sqs
 from tests.utils_for_tests.values_for_tests import MOCK_CREATED_AT_FORMATTED_STRING, MockFileDetails
 
-from constants import VACCINE_TYPE_TO_DISEASES_HASH_KEY
-
-from elasticache import get_valid_vaccine_types_from_cache
-
 # Ensure environment variables are mocked before importing from src files
 with patch.dict("os.environ", MOCK_ENVIRONMENT_DICT):
     from file_name_processor import lambda_handler, handle_record

filenameprocessor/tests/test_logging_decorator.py

@@ -48,10 +48,6 @@ def setUp(self):
         GenericSetUp(s3_client, firehose_client, sqs_client, dynamodb_client)
         s3_client.put_object(Bucket=BucketNames.SOURCE, Key=FILE_DETAILS.file_key)
 
-        redis_patcher = patch("clients.redis_client.hkeys", return_value=["FLU", "COVID19", "MMR", "RSV"])
-        self.addCleanup(redis_patcher.stop)
-        redis_patcher.start()
-
     def tearDown(self):
         """Clean the mock AWS environment"""
         GenericTearDown(s3_client, firehose_client, sqs_client, dynamodb_client)
@@ -77,6 +73,7 @@ def run(self, result=None):
             # Time is incremented by 1.0 for each call to time.time for ease of testing.
             # Range is set to a large number (100) due to many calls being made to time.time for some tests.
             patch("logging_decorator.time.time", side_effect=[0.0 + i for i in range(100)]),
+            patch("clients.redis_client.hkeys", return_value=["FLU"])
         ]
 
         # Set up the ExitStack. Note that patches need to be explicitly started so that they will be applied even when