fix: use xdist

Author: rubenfonseca

parallel_run_e2e.py

@@ -8,7 +8,7 @@ def main():
     features = Path("tests/e2e").rglob("infrastructure.py")
     workers = len(list(features)) - 1
 
-    command = f"poetry run pytest -n {workers} --dist loadfile -o log_cli=true tests/e2e"
+    command = f"poetry run pytest -n {workers} --dist loadgroup -o log_cli=true tests/e2e"
     result = subprocess.run(command.split(), shell=False)
     sys.exit(result.returncode)
 

tests/e2e/conftest.py

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

tests/e2e/event_handler/conftest.py

@@ -1,11 +1,10 @@
 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(tmp_path_factory: pytest.TempPathFactory, worker_id: str):
+@pytest.fixture(autouse=True, scope="package")
+def infrastructure():
     """Setup and teardown logic for E2E test infrastructure
 
     Yields
@@ -15,10 +14,6 @@ def infrastructure(tmp_path_factory: pytest.TempPathFactory, worker_id: str):
     """
     stack = EventHandlerStack()
     try:
-        return (
-            yield from call_once(
-                job_id=stack.feature_name, task=stack.deploy, tmp_path_factory=tmp_path_factory, worker_id=worker_id
-            )
-        )
+        yield stack.deploy()
     finally:
         stack.delete()

tests/e2e/event_handler/test_header_serializer.py

@@ -36,6 +36,7 @@ def lambda_function_url_endpoint(infrastructure: dict) -> str:
     return infrastructure.get("LambdaFunctionUrl", "")
 
 
+@pytest.mark.xdist_group(name="event_handler")
 def test_alb_headers_serializer(alb_basic_listener_endpoint):
     # GIVEN
     url = f"{alb_basic_listener_endpoint}/todos"
@@ -74,6 +75,7 @@ def test_alb_headers_serializer(alb_basic_listener_endpoint):
     assert response.cookies.get(last_cookie.name) == last_cookie.value
 
 
+@pytest.mark.xdist_group(name="event_handler")
 def test_alb_multi_value_headers_serializer(alb_multi_value_header_listener_endpoint):
     # GIVEN
     url = f"{alb_multi_value_header_listener_endpoint}/todos"
@@ -112,6 +114,7 @@ def test_alb_multi_value_headers_serializer(alb_multi_value_header_listener_endp
         assert response.cookies.get(cookie.name) == cookie.value
 
 
+@pytest.mark.xdist_group(name="event_handler")
 def test_api_gateway_rest_headers_serializer(apigw_rest_endpoint):
     # GIVEN
     url = f"{apigw_rest_endpoint}todos"
@@ -147,6 +150,7 @@ def test_api_gateway_rest_headers_serializer(apigw_rest_endpoint):
         assert response.cookies.get(cookie.name) == cookie.value
 
 
+@pytest.mark.xdist_group(name="event_handler")
 def test_api_gateway_http_headers_serializer(apigw_http_endpoint):
     # GIVEN
     url = f"{apigw_http_endpoint}todos"
@@ -182,6 +186,7 @@ def test_api_gateway_http_headers_serializer(apigw_http_endpoint):
         assert response.cookies.get(cookie.name) == cookie.value
 
 
+@pytest.mark.xdist_group(name="event_handler")
 def test_lambda_function_url_headers_serializer(lambda_function_url_endpoint):
     # GIVEN
     url = f"{lambda_function_url_endpoint}todos"  # the function url endpoint already has the trailing /

tests/e2e/event_handler/test_paths_ending_with_slash.py

@@ -33,6 +33,7 @@ def lambda_function_url_endpoint(infrastructure: dict) -> str:
     return infrastructure.get("LambdaFunctionUrl", "")
 
 
+@pytest.mark.xdist_group(name="event_handler")
 def test_api_gateway_rest_trailing_slash(apigw_rest_endpoint):
     # GIVEN API URL ends in a trailing slash
     url = f"{apigw_rest_endpoint}todos/"
@@ -51,6 +52,7 @@ def test_api_gateway_rest_trailing_slash(apigw_rest_endpoint):
     assert response.status_code == 200
 
 
+@pytest.mark.xdist_group(name="event_handler")
 def test_api_gateway_http_trailing_slash(apigw_http_endpoint):
     # GIVEN the URL for the API ends in a trailing slash API gateway should return a 404
     url = f"{apigw_http_endpoint}todos/"
@@ -67,6 +69,7 @@ def test_api_gateway_http_trailing_slash(apigw_http_endpoint):
         )
 
 
+@pytest.mark.xdist_group(name="event_handler")
 def test_lambda_function_url_trailing_slash(lambda_function_url_endpoint):
     # GIVEN the URL for the API ends in a trailing slash it should behave as if there was not one
     url = f"{lambda_function_url_endpoint}todos/"  # the function url endpoint already has the trailing /
@@ -83,6 +86,7 @@ def test_lambda_function_url_trailing_slash(lambda_function_url_endpoint):
         )
 
 
+@pytest.mark.xdist_group(name="event_handler")
 def test_alb_url_trailing_slash(alb_multi_value_header_listener_endpoint):
     # GIVEN url has a trailing slash - it should behave as if there was not one
     url = f"{alb_multi_value_header_listener_endpoint}/todos/"

tests/e2e/idempotency/conftest.py

@@ -1,11 +1,10 @@
 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: pytest.TempPathFactory, worker_id: str):
+@pytest.fixture(autouse=True, scope="package")
+def infrastructure():
     """Setup and teardown logic for E2E test infrastructure
 
     Yields
@@ -15,10 +14,6 @@ def infrastructure(tmp_path_factory: pytest.TempPathFactory, worker_id: str):
     """
     stack = IdempotencyDynamoDBStack()
     try:
-        return (
-            yield from call_once(
-                job_id=stack.feature_name, task=stack.deploy, tmp_path_factory=tmp_path_factory, worker_id=worker_id
-            )
-        )
+        yield stack.deploy()
     finally:
         stack.delete()

tests/e2e/idempotency/test_idempotency_dynamodb.py

@@ -27,6 +27,7 @@ def idempotency_table_name(infrastructure: dict) -> str:
     return infrastructure.get("DynamoDBTable", "")
 
 
+@pytest.mark.xdist_group(name="idempotency")
 def test_ttl_caching_expiration_idempotency(ttl_cache_expiration_handler_fn_arn: str):
     # GIVEN
     payload = json.dumps({"message": "Lambda Powertools - TTL 5s"})
@@ -56,6 +57,7 @@ def test_ttl_caching_expiration_idempotency(ttl_cache_expiration_handler_fn_arn:
     assert third_execution_response != second_execution_response
 
 
+@pytest.mark.xdist_group(name="idempotency")
 def test_ttl_caching_timeout_idempotency(ttl_cache_timeout_handler_fn_arn: str):
     # GIVEN
     payload_timeout_execution = json.dumps({"sleep": 5, "message": "Lambda Powertools - TTL 1s"})
@@ -79,6 +81,7 @@ def test_ttl_caching_timeout_idempotency(ttl_cache_timeout_handler_fn_arn: str):
     assert payload_working_execution == execution_working_response
 
 
+@pytest.mark.xdist_group(name="idempotency")
 def test_parallel_execution_idempotency(parallel_execution_handler_fn_arn: str):
     # GIVEN
     arguments = json.dumps({"message": "Lambda Powertools - Parallel execution"})

tests/e2e/logger/conftest.py

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

tests/e2e/logger/test_logger.py

@@ -17,6 +17,7 @@ def basic_handler_fn_arn(infrastructure: dict) -> str:
     return infrastructure.get("BasicHandlerArn", "")
 
 
+@pytest.mark.xdist_group(name="logger")
 def test_basic_lambda_logs_visible(basic_handler_fn, basic_handler_fn_arn):
     # GIVEN
     message = "logs should be visible with default settings"

tests/e2e/metrics/conftest.py

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

tests/e2e/metrics/test_metrics.py

@@ -28,6 +28,7 @@ def cold_start_fn_arn(infrastructure: dict) -> str:
 METRIC_NAMESPACE = "powertools-e2e-metric"
 
 
+@pytest.mark.xdist_group(name="metrics")
 def test_basic_lambda_metric_is_visible(basic_handler_fn: str, basic_handler_fn_arn: str):
     # GIVEN
     metric_name = data_builder.build_metric_name()
@@ -47,6 +48,7 @@ def test_basic_lambda_metric_is_visible(basic_handler_fn: str, basic_handler_fn_
     assert metric_values == [3.0]
 
 
+@pytest.mark.xdist_group(name="metrics")
 def test_cold_start_metric(cold_start_fn_arn: str, cold_start_fn: str):
     # GIVEN
     metric_name = "ColdStart"

tests/e2e/parameters/conftest.py

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

tests/e2e/parameters/test_appconfig.py

@@ -35,6 +35,7 @@ def parameter_appconfig_freeform_profile(infrastructure: dict) -> str:
     return infrastructure.get("AppConfigProfile", "")
 
 
+@pytest.mark.xdist_group(name="parameters")
 def test_get_parameter_appconfig_freeform(
     parameter_appconfig_freeform_handler_fn_arn: str,
     parameter_appconfig_freeform_value: str,

tests/e2e/parameters/test_ssm.py

@@ -17,7 +17,7 @@ def parameters_list(infrastructure: dict) -> List[str]:
     return json.loads(param_list)
 
 
-#
+@pytest.mark.xdist_group(name="parameters")
 def test_get_parameters_by_name(
     ssm_get_parameters_by_name_fn_arn: str,
     parameters_list: str,

tests/e2e/streaming/conftest.py

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