Skip to content

Commit 1ff61ad

Browse files
authored
Merge pull request #380 from NHSDigital/VED-172-Remove-e2e-tests-from-dev-PR-Merge
VED-172 remove e2e tests for internal-dev
2 parents de82aea + 9b43b17 commit 1ff61ad

13 files changed

+75
-10
lines changed

e2e/poetry.lock

Lines changed: 28 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

e2e/test_authorization.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import uuid
2+
import unittest
23
from typing import Set
34

45
from lib.apigee import ApigeeApp
@@ -15,9 +16,12 @@
1516
from utils.immunisation_api import ImmunisationApi
1617
from utils.resource import generate_imms_resource
1718
from utils.mappings import VaccineTypes
19+
from utils.constants import env_internal_dev
1820

1921

22+
@unittest.skipIf(env_internal_dev, "TestApplicationRestrictedAuthorization for internal-dev environment")
2023
class TestApplicationRestrictedAuthorization(ImmunizationBaseTest):
24+
2125
my_app: ApigeeApp
2226
my_imms_api: ImmunisationApi
2327

@@ -169,6 +173,7 @@ def test_search_imms_unauthorised_vax(self):
169173
self.assertEqual(response.status_code, 403, response.text)
170174

171175

176+
@unittest.skipIf(env_internal_dev, "TestCis2Authorization for internal-dev environment")
172177
class TestCis2Authorization(ImmunizationBaseTest):
173178
my_app: ApigeeApp
174179
my_imms_api: ImmunisationApi

e2e/test_create_immunization.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
1+
import unittest
12
from utils.base_test import ImmunizationBaseTest
23
from utils.resource import generate_imms_resource, get_full_row_from_identifier
4+
from utils.constants import env_internal_dev
35

46

7+
@unittest.skipIf(env_internal_dev, "TestCreateImmunization for internal-dev environment")
58
class TestCreateImmunization(ImmunizationBaseTest):
9+
610
def test_create_imms(self):
711
"""it should create a FHIR Immunization resource"""
812
for imms_api in self.imms_apis:

e2e/test_delete_immunization.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
1+
import unittest
12
from utils.base_test import ImmunizationBaseTest
23
from utils.immunisation_api import parse_location
34
from utils.resource import generate_imms_resource
5+
from utils.constants import env_internal_dev
46

57

8+
@unittest.skipIf(env_internal_dev, "TestDeleteImmunization for internal-dev environment")
69
class TestDeleteImmunization(ImmunizationBaseTest):
710

811
def test_delete_imms(self):

e2e/test_delta_immunization.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,19 @@
22
from utils.base_test import ImmunizationBaseTest
33
from utils.immunisation_api import parse_location
44
from utils.resource import generate_imms_resource
5+
from utils.constants import env_internal_dev
56
from mypy_boto3_dynamodb.service_resource import DynamoDBServiceResource
67
import time
78
import copy
89
import boto3
910
from botocore.config import Config
1011
import os
12+
import unittest
1113

1214

15+
@unittest.skipIf(env_internal_dev, "TestDeltaImmunization for internal-dev environment")
1316
class TestDeltaImmunization(ImmunizationBaseTest):
17+
1418
CREATE_OPERATION = "CREATE"
1519
UPDATE_OPERATION = "UPDATE"
1620
DELETE_OPERATION = "DELETE"

e2e/test_get_immunization.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
from decimal import Decimal
22
import uuid
3+
import unittest
34

45
from utils.base_test import ImmunizationBaseTest
56
from utils.immunisation_api import parse_location
67
from utils.resource import generate_imms_resource, generate_filtered_imms_resource
78
from utils.mappings import EndpointOperationNames, VaccineTypes
9+
from utils.constants import env_internal_dev
810

911

12+
@unittest.skipIf(env_internal_dev, "TestGetImmunization for internal-dev environment")
1013
class TestGetImmunization(ImmunizationBaseTest):
1114

1215
def test_get_imms(self):

e2e/test_proxy.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,15 @@
22
import subprocess
33
import unittest
44
import uuid
5-
65
import requests
76

87
from lib.env import get_service_base_path, get_status_endpoint_api_key
8+
from utils.constants import env_internal_dev
99

1010

11+
@unittest.skipIf(env_internal_dev, "TestProxyHealthcheck for internal-dev environment")
1112
class TestProxyHealthcheck(unittest.TestCase):
13+
1214
proxy_url: str
1315
status_api_key: str
1416

@@ -31,6 +33,7 @@ def test_status(self):
3133
f"service is not healthy: status: {body['status']}")
3234

3335

36+
@unittest.skipIf(env_internal_dev, "TestMtls for internal-dev environment")
3437
class TestMtls(unittest.TestCase):
3538
"""Our backend is secured using mTLS. This test makes sure you can't hit the backend directly"""
3639

@@ -68,9 +71,11 @@ def get_backend_url() -> str:
6871
raise RuntimeError(f"Failed to run command\n{e}")
6972

7073

74+
@unittest.skipIf(env_internal_dev, "TestProxyAuthorization for internal-dev environment")
7175
class TestProxyAuthorization(unittest.TestCase):
7276
"""Our apigee proxy has its own authorization.
7377
This class test different authorization access levels/roles authentication types that are supported"""
78+
7479
proxy_url: str
7580

7681
@classmethod

e2e/test_search_immunization.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11
import pprint
22
import uuid
3+
import unittest
34
from typing import NamedTuple, Literal, Optional, List
45
from decimal import Decimal
56

67
from utils.base_test import ImmunizationBaseTest
78
from utils.constants import valid_nhs_number1, valid_nhs_number2, valid_patient_identifier2, valid_patient_identifier1
89
from utils.resource import generate_imms_resource, generate_filtered_imms_resource
910
from utils.mappings import VaccineTypes
11+
from utils.constants import env_internal_dev
1012

1113

14+
@unittest.skipIf(env_internal_dev, "TestSearchImmunization for internal-dev environment")
1215
class TestSearchImmunization(ImmunizationBaseTest):
1316
# NOTE: In each test, the result may contain more hits. We only assert if the resource that we created is
1417
# in the result set and assert the one that we don't expect is not present.

e2e/test_sqs_dlq.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,13 @@
44
import os
55
from utils.delete_sqs_messages import read_and_delete_messages
66
from utils.get_sqs_url import get_queue_url
7+
from utils.constants import env_internal_dev
78
from botocore.exceptions import ClientError # Handle potential errors
89

910

11+
@unittest.skipIf(env_internal_dev, "TestSQS for internal-dev environment")
1012
class TestSQS(unittest.TestCase):
13+
1114
def setUp(self):
1215
# Get SQS queue url
1316
self.queue_name = os.environ["AWS_SQS_QUEUE_NAME"]

e2e/test_update_immunization.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
import copy
22
import uuid
3-
3+
import unittest
44
from utils.base_test import ImmunizationBaseTest
55
from utils.immunisation_api import parse_location
66
from utils.resource import generate_imms_resource
7+
from utils.constants import env_internal_dev
78

89

10+
@unittest.skipIf(env_internal_dev, "TestUpdateImmunization for internal-dev environment")
911
class TestUpdateImmunization(ImmunizationBaseTest):
1012

1113
def test_update_imms(self):

0 commit comments

Comments
 (0)