fix: make sure multiple e2e tests run concurrently

Author: rubenfonseca

tests/e2e/conftest.py

@@ -23,6 +23,7 @@ def lambda_layer_build(tmp_path_factory: pytest.TempPathFactory, worker_id: str)
 
     layer = LocalLambdaPowertoolsLayer()
     yield from call_once(
+        id="lambda_layer",
         task=layer.build,
         tmp_path_factory=tmp_path_factory,
         worker_id=worker_id,

tests/e2e/event_handler/conftest.py

@@ -1,10 +1,11 @@
 import pytest
 
 from tests.e2e.event_handler.infrastructure import EventHandlerStack
+from tests.e2e.utils.infrastructure import call_once
 
 
 @pytest.fixture(autouse=True, scope="module")
-def infrastructure():
+def infrastructure(tmp_path_factory: pytest.TempPathFactory, worker_id: str):
     """Setup and teardown logic for E2E test infrastructure
 
     Yields
@@ -14,6 +15,10 @@ def infrastructure():
     """
     stack = EventHandlerStack()
     try:
-        yield stack.deploy()
+        return (
+            yield from call_once(
+                job_id=stack.feature_name, task=stack.deploy, tmp_path_factory=tmp_path_factory, worker_id=worker_id
+            )
+        )
     finally:
         stack.delete()

tests/e2e/idempotency/conftest.py

@@ -1,10 +1,11 @@
 import pytest
 
 from tests.e2e.idempotency.infrastructure import IdempotencyDynamoDBStack
+from tests.e2e.utils.infrastructure import call_once
 
 
 @pytest.fixture(autouse=True, scope="module")
-def infrastructure(tmp_path_factory, worker_id):
+def infrastructure(tmp_path_factory: pytest.TempPathFactory, worker_id: str):
     """Setup and teardown logic for E2E test infrastructure
 
     Yields
@@ -14,6 +15,10 @@ def infrastructure(tmp_path_factory, worker_id):
     """
     stack = IdempotencyDynamoDBStack()
     try:
-        yield stack.deploy()
+        return (
+            yield from call_once(
+                job_id=stack.feature_name, task=stack.deploy, tmp_path_factory=tmp_path_factory, worker_id=worker_id
+            )
+        )
     finally:
         stack.delete()

tests/e2e/logger/conftest.py

@@ -1,6 +1,7 @@
 import pytest
 
 from tests.e2e.logger.infrastructure import LoggerStack
+from tests.e2e.utils.infrastructure import call_once
 
 
 @pytest.fixture(autouse=True, scope="module")
@@ -14,6 +15,13 @@ def infrastructure(tmp_path_factory, worker_id):
     """
     stack = LoggerStack()
     try:
-        yield stack.deploy()
+        return (
+            yield from call_once(
+                job_id=stack.feature_name,
+                task=stack.deploy,
+                tmp_path_factory=tmp_path_factory,
+                worker_id=worker_id,
+            )
+        )
     finally:
         stack.delete()

tests/e2e/metrics/conftest.py

@@ -1,6 +1,7 @@
 import pytest
 
 from tests.e2e.metrics.infrastructure import MetricsStack
+from tests.e2e.utils.infrastructure import call_once
 
 
 @pytest.fixture(autouse=True, scope="module")
@@ -14,6 +15,10 @@ def infrastructure(tmp_path_factory, worker_id):
     """
     stack = MetricsStack()
     try:
-        yield stack.deploy()
+        return (
+            yield from call_once(
+                job_id=stack.feature_name, task=stack.deploy, tmp_path_factory=tmp_path_factory, worker_id=worker_id
+            )
+        )
     finally:
         stack.delete()

tests/e2e/parameters/conftest.py

@@ -1,6 +1,7 @@
 import pytest
 
 from tests.e2e.parameters.infrastructure import ParametersStack
+from tests.e2e.utils.infrastructure import call_once
 
 
 @pytest.fixture(autouse=True, scope="module")
@@ -14,6 +15,10 @@ def infrastructure(tmp_path_factory, worker_id):
     """
     stack = ParametersStack()
     try:
-        yield stack.deploy()
+        return (
+            yield from call_once(
+                job_id=stack.feature_name, task=stack.deploy, tmp_path_factory=tmp_path_factory, worker_id=worker_id
+            )
+        )
     finally:
         stack.delete()

tests/e2e/streaming/conftest.py

@@ -1,6 +1,7 @@
 import pytest
 
 from tests.e2e.streaming.infrastructure import StreamingStack
+from tests.e2e.utils.infrastructure import call_once
 
 
 @pytest.fixture(autouse=True, scope="module")
@@ -14,6 +15,10 @@ def infrastructure(tmp_path_factory, worker_id):
     """
     stack = StreamingStack()
     try:
-        yield stack.deploy()
+        return (
+            yield from call_once(
+                job_id=stack.feature_name, task=stack.deploy, tmp_path_factory=tmp_path_factory, worker_id=worker_id
+            )
+        )
     finally:
         stack.delete()

tests/e2e/tracer/conftest.py

@@ -1,10 +1,11 @@
 import pytest
 
 from tests.e2e.tracer.infrastructure import TracerStack
+from tests.e2e.utils.infrastructure import call_once
 
 
 @pytest.fixture(autouse=True, scope="module")
-def infrastructure():
+def infrastructure(tmp_path_factory, worker_id):
     """Setup and teardown logic for E2E test infrastructure
 
 
@@ -15,6 +16,10 @@ def infrastructure():
     """
     stack = TracerStack()
     try:
-        yield stack.deploy()
+        return (
+            yield from call_once(
+                job_id=stack.feature_name, task=stack.deploy, tmp_path_factory=tmp_path_factory, worker_id=worker_id
+            )
+        )
     finally:
         stack.delete()

tests/e2e/utils/infrastructure.py

@@ -1,7 +1,6 @@
 import json
 import logging
 import os
-import platform
 import subprocess
 import sys
 import textwrap
@@ -57,7 +56,7 @@ def __init__(self) -> None:
         self._feature_infra_module_path = self.feature_path / "infrastructure"
         self._feature_infra_file = self.feature_path / "infrastructure.py"
         self._handlers_dir = self.feature_path / "handlers"
-        self._cdk_out_dir: Path = CDK_OUT_PATH / "-".join(platform.python_version_tuple()) / self.feature_name
+        self._cdk_out_dir: Path = CDK_OUT_PATH / self.feature_name
         self._stack_outputs_file = f'{self._cdk_out_dir / "stack_outputs.json"}'
 
         if not self._feature_infra_file.exists():
@@ -287,6 +286,7 @@ def add_cfn_output(self, name: str, value: str, arn: str = ""):
 
 
 def call_once(
+    job_id: str,
     task: Callable,
     tmp_path_factory: pytest.TempPathFactory,
     worker_id: str,
@@ -296,6 +296,8 @@ def call_once(
 
     Parameters
     ----------
+    id : str
+        Random string that uniquely identifies this call
     task : Callable
         Function to call once and JSON serialize result whether parallel test is enabled or not.
     tmp_path_factory : pytest.TempPathFactory
@@ -318,7 +320,7 @@ def call_once(
         else:
             # tmp dir shared by all workers
             root_tmp_dir = tmp_path_factory.getbasetemp().parent
-            cache = root_tmp_dir / f"{PYTHON_RUNTIME_VERSION}_cache.json"
+            cache = root_tmp_dir / f"{PYTHON_RUNTIME_VERSION}_{job_id}_cache.json"
 
             with FileLock(f"{cache}.lock"):
                 # If cache exists, return task outputs back