Skip to content

Commit 7e99c4e

Browse files
JamesW1-NHSJamesW1-NHS
committed
Merge branch 'master' into VED-464-Vaccine-Product-Code
2 parents 18a85ae + 9c3d637 commit 7e99c4e

18 files changed

+342
-272
lines changed

‎.github/workflows/sonarcloud.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,8 @@ jobs:
6969
- name: Run unittest with coverage-ack-lambda
7070
working-directory: ack_backend
7171
id: acklambda
72+
env:
73+
PYTHONPATH: ${{ github.workspace }}/ack_backend/src:${{ github.workspace }}/ack_backend/tests
7274
continue-on-error: true
7375
run: |
7476
poetry install

‎ack_backend/pyproject.toml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ version = "0.1.0"
44
description = ""
55
authors = ["Your Name <[email protected]>"]
66
readme = "README.md"
7+
packages = [
8+
{include = "src"}
9+
]
710

811
[tool.poetry.dependencies]
912
python = "~3.11"

‎ack_backend/tests/test_ack_processor.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88
from boto3 import client as boto3_client
99
from moto import mock_s3, mock_firehose
1010

11-
from tests.utils_for_ack_backend_tests.mock_environment_variables import MOCK_ENVIRONMENT_DICT, BucketNames, REGION_NAME
12-
from tests.utils_for_ack_backend_tests.generic_setup_and_teardown_for_ack_backend import GenericSetUp, GenericTearDown
13-
from tests.utils_for_ack_backend_tests.utils_for_ack_backend_tests import (
11+
from tests.utils.mock_environment_variables import MOCK_ENVIRONMENT_DICT, BucketNames, REGION_NAME
12+
from tests.utils.generic_setup_and_teardown_for_ack_backend import GenericSetUp, GenericTearDown
13+
from tests.utils.utils_for_ack_backend_tests import (
1414
setup_existing_ack_file,
1515
validate_ack_file_content,
1616
)
17-
from tests.utils_for_ack_backend_tests.values_for_ack_backend_tests import (
17+
from tests.utils.values_for_ack_backend_tests import (
1818
DiagnosticsDictionaries,
1919
MOCK_MESSAGE_DETAILS,
2020
ValidValues,

‎ack_backend/tests/test_convert_message_to_ack_row.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
from moto import mock_s3, mock_firehose
77

88

9-
from tests.utils_for_ack_backend_tests.mock_environment_variables import MOCK_ENVIRONMENT_DICT, REGION_NAME
10-
from tests.utils_for_ack_backend_tests.generic_setup_and_teardown_for_ack_backend import GenericSetUp, GenericTearDown
11-
from tests.utils_for_ack_backend_tests.values_for_ack_backend_tests import (
9+
from tests.utils.mock_environment_variables import MOCK_ENVIRONMENT_DICT, REGION_NAME
10+
from tests.utils.generic_setup_and_teardown_for_ack_backend import GenericSetUp, GenericTearDown
11+
from tests.utils.values_for_ack_backend_tests import (
1212
DefaultValues,
1313
ValidValues,
1414
DiagnosticsDictionaries,

‎ack_backend/tests/test_splunk_logging.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@
88
from moto import mock_s3
99
from boto3 import client as boto3_client
1010

11-
from tests.utils_for_ack_backend_tests.values_for_ack_backend_tests import (
11+
from tests.utils.values_for_ack_backend_tests import (
1212
ValidValues,
1313
InvalidValues,
1414
DiagnosticsDictionaries,
1515
EXPECTED_ACK_LAMBDA_RESPONSE_FOR_SUCCESS,
1616
)
17-
from tests.utils_for_ack_backend_tests.mock_environment_variables import MOCK_ENVIRONMENT_DICT, BucketNames
18-
from tests.utils_for_ack_backend_tests.generic_setup_and_teardown_for_ack_backend import GenericSetUp, GenericTearDown
19-
from tests.utils_for_ack_backend_tests.utils_for_ack_backend_tests import generate_event
17+
from tests.utils.mock_environment_variables import MOCK_ENVIRONMENT_DICT, BucketNames
18+
from tests.utils.generic_setup_and_teardown_for_ack_backend import GenericSetUp, GenericTearDown
19+
from tests.utils.utils_for_ack_backend_tests import generate_event
2020

2121
with patch.dict("os.environ", MOCK_ENVIRONMENT_DICT):
2222
from ack_processor import lambda_handler

‎ack_backend/tests/test_update_ack_file.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
from boto3 import client as boto3_client
88
from moto import mock_s3
99

10-
from tests.utils_for_ack_backend_tests.values_for_ack_backend_tests import ValidValues, DefaultValues
11-
from tests.utils_for_ack_backend_tests.mock_environment_variables import MOCK_ENVIRONMENT_DICT, BucketNames, REGION_NAME
12-
from tests.utils_for_ack_backend_tests.generic_setup_and_teardown_for_ack_backend import GenericSetUp, GenericTearDown
13-
from tests.utils_for_ack_backend_tests.utils_for_ack_backend_tests import (
10+
from tests.utils.values_for_ack_backend_tests import ValidValues, DefaultValues
11+
from tests.utils.mock_environment_variables import MOCK_ENVIRONMENT_DICT, BucketNames, REGION_NAME
12+
from tests.utils.generic_setup_and_teardown_for_ack_backend import GenericSetUp, GenericTearDown
13+
from tests.utils.utils_for_ack_backend_tests import (
1414
setup_existing_ack_file,
1515
obtain_current_ack_file_content,
1616
generate_expected_ack_file_row,

ack_backend/tests/utils_for_ack_backend_tests/generic_setup_and_teardown_for_ack_backend.py renamed to ack_backend/tests/utils/generic_setup_and_teardown_for_ack_backend.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"""Generic setup and teardown for ACK backend tests"""
22

3-
from tests.utils_for_ack_backend_tests.mock_environment_variables import BucketNames, Firehose, REGION_NAME
3+
from tests.utils.mock_environment_variables import BucketNames, Firehose, REGION_NAME
44

55

66
class GenericSetUp:

ack_backend/tests/utils_for_ack_backend_tests/mock_environment_variables.py renamed to ack_backend/tests/utils/mock_environment_variables.py

File renamed without changes.

ack_backend/tests/utils_for_ack_backend_tests/utils_for_ack_backend_tests.py renamed to ack_backend/tests/utils/utils_for_ack_backend_tests.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
import json
44
from boto3 import client as boto3_client
5-
from tests.utils_for_ack_backend_tests.values_for_ack_backend_tests import ValidValues, MOCK_MESSAGE_DETAILS
6-
from tests.utils_for_ack_backend_tests.mock_environment_variables import REGION_NAME, BucketNames
5+
from tests.utils.values_for_ack_backend_tests import ValidValues, MOCK_MESSAGE_DETAILS
6+
from tests.utils.mock_environment_variables import REGION_NAME, BucketNames
77

88
s3_client = boto3_client("s3", region_name=REGION_NAME)
99
firehose_client = boto3_client("firehose", region_name=REGION_NAME)

ack_backend/tests/utils_for_ack_backend_tests/values_for_ack_backend_tests.py renamed to ack_backend/tests/utils/values_for_ack_backend_tests.py

File renamed without changes.

0 commit comments

Comments
 (0)