14 errors

Author: nhsdevws

ack_backend/tests/test_splunk_logging.py

@@ -19,7 +19,7 @@
 from tests.utils_for_ack_backend_tests.utils_for_ack_backend_tests import generate_event
 
 with patch.dict("os.environ", MOCK_ENVIRONMENT_DICT):
-    from src.ack_processor import lambda_handler
+    from ack_processor import lambda_handler
 
 s3_client = boto3_client("s3")
 

backend/tests/test_fhir_repository.py

@@ -42,7 +42,7 @@ def tearDown(self):
         super().tearDown()
 
 
-class TestGetImmunizationByIdentifier(TestFhirRepository):
+class TestGetImmunizationByIdentifier(TestFhirRepositoryBase):
     def setUp(self):
         super().setUp()
         self.table = MagicMock()
@@ -170,12 +170,17 @@ def _make_a_patient(nhs_number="1234567890") -> dict:
     }
 
 
-class TestCreateImmunizationMainIndex(unittest.TestCase):
+class TestCreateImmunizationMainIndex(TestFhirRepositoryBase):
     def setUp(self):
+        super().setUp()
         self.table = MagicMock()
         self.repository = ImmunizationRepository(table=self.table)
         self.patient = {"id": "a-patient-id", "identifier": {"value": "an-identifier"}}
 
+    def tearDown(self):
+        patch.stopall()
+        super().tearDown()
+
     def test_create_immunization(self):
         """it should create Immunization, and return created object"""
         imms = create_covid_19_immunization_dict(imms_id="an-id")
@@ -355,7 +360,7 @@ def test_create_patient_with_unauthorised_vaccine_type_permissions(self):
             self.repository.create_immunization(imms, self.patient, "COVID:create", "Test")
 
 
-class TestUpdateImmunization(TestFhirRepository):
+class TestUpdateImmunization(TestFhirRepositoryBase):
     def setUp(self):
         super().setUp()
         self.table = MagicMock()
@@ -678,7 +683,7 @@ def test_bad_response_from_dynamo(self):
         self.assertDictEqual(e.exception.response, response)
 
 
-class TestImmunizationDecimals(TestFhirRepository):
+class TestImmunizationDecimals(TestFhirRepositoryBase):
     """It should create a record and keep decimal precision"""
 
     def setUp(self):

backend/tests/test_filter.py

@@ -5,8 +5,8 @@
 
 import unittest
 
-from src.constants import Urls
-from src.filter import (
+from constants import Urls
+from filter import (
     Filter,
     remove_reference_to_contained_practitioner,
     create_reference_to_patient_resource,

backend/tests/test_immunization_post_validator.py

@@ -9,7 +9,7 @@
 from sample_data.mock_redis_cache import fake_hget
 
 
-from src.models.fhir_immunization import ImmunizationValidator
+from models.fhir_immunization import ImmunizationValidator
 from tests.utils.generic_utils import (
     # these have an underscore to avoid pytest collecting them as tests
     test_invalid_values_rejected as _test_invalid_values_rejected,

backend/tests/test_immunization_pre_validator.py

@@ -9,16 +9,16 @@
 
 from jsonpath_ng.ext import parse
 
-from src.clients import redis_client
-from src.models.fhir_immunization import ImmunizationValidator
-from src.models.utils.generic_utils import get_generic_extension_value
+from clients import redis_client
+from models.fhir_immunization import ImmunizationValidator
+from models.utils.generic_utils import get_generic_extension_value
 from .utils.generic_utils import (
     # these have an underscore to avoid pytest collecting them as tests
     test_valid_values_accepted as _test_valid_values_accepted,
     test_invalid_values_rejected as _test_invalid_values_rejected,
     load_json_data,
 )
-from src.models.utils.generic_utils import (
+from models.utils.generic_utils import (
     patient_name_given_field_location,
     patient_name_family_field_location,
     practitioner_name_given_field_location,

backend/tests/test_log_structure_wrapper.py

@@ -1,11 +1,11 @@
 import unittest
 import json
 from unittest.mock import patch, MagicMock, ANY
-from src.log_structure import function_info
+from log_structure import function_info
 
 
-@patch('src.log_structure.firehose_logger')
-@patch('src.log_structure.logger')
+@patch('log_structure.firehose_logger')
+@patch('log_structure.logger')
 class TestFunctionInfoWrapper(unittest.TestCase):
 
     @staticmethod

delta_backend/tests/test_current_period.py

@@ -1,6 +1,6 @@
 import unittest
 from datetime import datetime, timezone
-from src.extractor import Extractor 
+from extractor import Extractor 
 
 
 class TestIsCurrentPeriod(unittest.TestCase):

mesh_processor/tests/test_converter.py

@@ -1,6 +1,6 @@
 from unittest import TestCase
 from unittest.mock import patch, MagicMock
-from src.converter import lambda_handler, ensure_dat_extension
+from converter import lambda_handler, ensure_dat_extension
 
 
 class TestLambdaHandler(TestCase):

recordprocessor/tests/test_make_and_upload_ack_file.py

@@ -10,7 +10,7 @@
 from tests.utils_for_recordprocessor_tests.values_for_recordprocessor_tests import MockFileDetails
 
 with patch("os.environ", MOCK_ENVIRONMENT_DICT):
-    from src.make_and_upload_ack_file import make_ack_data, upload_ack_file, make_and_upload_ack_file
+    from make_and_upload_ack_file import make_ack_data, upload_ack_file, make_and_upload_ack_file
     from clients import REGION_NAME
 
 from tests.utils_for_recordprocessor_tests.utils_for_recordprocessor_tests import GenericSetUp, GenericTearDown

recordprocessor/tests/test_process_row.py

@@ -20,10 +20,10 @@
 from tests.utils_for_recordprocessor_tests.mock_environment_variables import MOCK_ENVIRONMENT_DICT
 
 with patch("os.environ", MOCK_ENVIRONMENT_DICT):
-    # Do not attempt 'from src.mappings import Vaccine' as this imports a different instance of Vaccine
+    # Do not attempt 'from mappings import Vaccine' as this imports a different instance of Vaccine
     # and tests will break
     from clients import REGION_NAME
-    from src.process_row import process_row
+    from process_row import process_row
 
 s3_client = boto3_client("s3", region_name=REGION_NAME)
 ROW_DETAILS = MockFieldDictionaries.all_fields