From 4646572953d5d011621b1f7f96b8f0561dac29c7 Mon Sep 17 00:00:00 2001 From: Joao Gilberto Magalhaes Date: Mon, 16 Feb 2026 14:20:02 -0500 Subject: [PATCH] Update ACME E2E tests: use specific Docker Compose file and ensure correct working directory - Replaced `compose_file` references with `docker-compose-acme-e2e.yml` for improved clarity. - Added working directory changes for Docker Compose commands to ensure relative paths work properly. - Restored original working directory after test execution for cleanup consistency. --- tests_e2e/test_docker_compose.py | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/tests_e2e/test_docker_compose.py b/tests_e2e/test_docker_compose.py index fc1e9d1..6e30ae4 100644 --- a/tests_e2e/test_docker_compose.py +++ b/tests_e2e/test_docker_compose.py @@ -889,11 +889,17 @@ def docker_compose_acme() -> Generator[None, None, None]: print() print(" → Starting ACME test environment in stages...") + # Change to docker directory so relative paths in docker-compose work correctly + original_dir = os.getcwd() + docker_dir = DOCKER_DIR + try: + os.chdir(docker_dir) + # Stage 1: Start Pebble ACME server first print(" → Stage 1: Starting Pebble ACME server...") result = subprocess.run( - ["docker", "compose", "-f", compose_file, "up", "-d", "pebble"], + ["docker", "compose", "-f", "docker-compose-acme-e2e.yml", "up", "-d", "pebble"], capture_output=True, text=True, check=True @@ -921,7 +927,7 @@ def docker_compose_acme() -> Generator[None, None, None]: # Get container logs logs_result = subprocess.run( - ["docker", "compose", "-f", compose_file, "logs", "pebble"], + ["docker", "compose", "-f", "docker-compose-acme-e2e.yml", "logs", "pebble"], capture_output=True, text=True ) @@ -934,7 +940,7 @@ def docker_compose_acme() -> Generator[None, None, None]: # Stage 2: Start HAProxy print(" → Stage 2: Starting HAProxy...") result = subprocess.run( - ["docker", "compose", "-f", compose_file, "up", "-d", "haproxy"], + ["docker", "compose", "-f", "docker-compose-acme-e2e.yml", "up", "-d", "haproxy"], capture_output=True, text=True, check=True @@ -945,7 +951,7 @@ def docker_compose_acme() -> Generator[None, None, None]: # Stage 3: Start Backend print(" → Stage 3: Starting backend...") result = subprocess.run( - ["docker", "compose", "-f", compose_file, "up", "-d", "backend"], + ["docker", "compose", "-f", "docker-compose-acme-e2e.yml", "up", "-d", "backend"], capture_output=True, text=True, check=True @@ -961,12 +967,15 @@ def docker_compose_acme() -> Generator[None, None, None]: # Cleanup print(" → Stopping ACME test environment...") subprocess.run( - ["docker", "compose", "-f", compose_file, "down", "--remove-orphans", "-t", "0"], + ["docker", "compose", "-f", "docker-compose-acme-e2e.yml", "down", "--remove-orphans", "-t", "0"], capture_output=True, text=True ) print(" ✓ Services stopped and cleaned up") + # Restore original directory + os.chdir(original_dir) + # Clean up volume subprocess.run( ["docker", "volume", "rm", volume_name],