docker clean up

Author: Karthikeyannhs

tests/integration/lambda/conftest.py

@@ -103,13 +103,15 @@ def lambda_runtime_url(request, lambda_zip):  # noqa: ARG001
         check=lambda: is_responsive(base_url),
     )
 
-    return base_url
-
+    yield base_url
 
-@pytest.fixture(scope="session")
-def lambda_client(boto3_session: Session, lambda_runtime_url: URL) -> BaseClient:
-    """Return a boto3 Lambda client pointing at the simulated lambda runtime."""
-    return boto3_session.client("lambda", endpoint_url=str(lambda_runtime_url))
+    subprocess.run(  # noqa: S603
+        [docker_path, "compose", "-f", str(compose_file), "rm", "-f", "-s", "lambda-api", "api-gateway-mock"],
+        check=False,
+        env=env,
+        capture_output=True,
+        text=True,
+    )
 
 
 @pytest.fixture(scope="session")
@@ -134,6 +136,12 @@ def api_gateway_endpoint(request: pytest.FixtureRequest, lambda_runtime_url):  #
     return base_url
 
 
+@pytest.fixture(scope="session")
+def lambda_client(boto3_session: Session, lambda_runtime_url: URL) -> BaseClient:
+    """Return a boto3 Lambda client pointing at the simulated lambda runtime."""
+    return boto3_session.client("lambda", endpoint_url=str(lambda_runtime_url))
+
+
 @pytest.fixture
 def lambda_logs(docker_services) -> Callable[[], list[str]]:
     """Return a callable that fetches the latest lambda-api logs."""
@@ -168,5 +176,4 @@ def get_lambda_logs(docker_services) -> list[str]:  # noqa :ARG001
         text=True,
         check=False,
     )
-
-    return [line.partition("|")[-1].strip() for line in result.stdout.splitlines()]
+    return [line.split("|", 1)[-1].strip() for line in result.stdout.splitlines()]

tests/integration/lambda/test_app_running_as_lambda.py

@@ -30,16 +30,16 @@
 logger = logging.getLogger(__name__)
 
 
-def test_install_and_call_lambda_flask(
+def test_install_and_call_lambda_flask(  # noqa: PLR0913
     lambda_client: BaseClient,
     persisted_person: NHSNumber,
     consumer_to_active_rsv_campaign_mapping: ConsumerMapping,  # noqa: ARG001
     consumer_id: ConsumerId,
     secretsmanager_client: BaseClient,  # noqa :ARG001
+    lambda_logs: Callable[[], list[str]],
 ):
     """Given lambda installed into localstack, run it via boto3 lambda client"""
     # Given
-
     # When
     request_payload = {
         "version": "2.0",
@@ -69,9 +69,7 @@ def test_install_and_call_lambda_flask(
         FunctionName="function",
         InvocationType="RequestResponse",
         Payload=json.dumps(request_payload),
-        # LogType="Tail", #TODO
     )
-    # log_output = base64.b64decode(response["LogResult"]).decode("utf-8")
 
     # Then
     assert_that(response, has_entries(StatusCode=HTTPStatus.OK))
@@ -82,7 +80,8 @@ def test_install_and_call_lambda_flask(
         has_entries(statusCode=HTTPStatus.OK, body=is_json_that(has_key("processedSuggestions"))),
     )
 
-    # assert_that(log_output, contains_string("checking nhs_number"))
+    messages = lambda_logs()
+    assert_that(messages, has_item(contains_string("checking nhs_number")))
 
 
 def test_install_and_call_flask_lambda_over_http(