badblocks/docker-easy-haproxy
1
0
Fork 0
Code Activity

Update ACME E2E tests: use specific Docker Compose file and ensure correct working directory

Browse source 
- 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.
This commit is contained in:
Joao Gilberto Magalhaes 2026-02-16 14:20:02 -05:00
parent 6997777f41
commit 4646572953
1 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

19
tests_e2e/test_docker_compose.py
View file

@ -889,11 +889,17 @@ def docker_compose_acme() -> Generator[None, None, None]:
print() print()
print(" → Starting ACME test environment in stages...") 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: try:
os.chdir(docker_dir)
# Stage 1: Start Pebble ACME server first # Stage 1: Start Pebble ACME server first
print(" → Stage 1: Starting Pebble ACME server...") print(" → Stage 1: Starting Pebble ACME server...")
result = subprocess.run( 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, capture_output=True,
text=True, text=True,
check=True check=True
@ -921,7 +927,7 @@ def docker_compose_acme() -> Generator[None, None, None]:
# Get container logs # Get container logs
logs_result = subprocess.run( logs_result = subprocess.run(
["docker", "compose", "-f", compose_file, "logs", "pebble"], ["docker", "compose", "-f", "docker-compose-acme-e2e.yml", "logs", "pebble"],
capture_output=True, capture_output=True,
text=True text=True
) )
@ -934,7 +940,7 @@ def docker_compose_acme() -> Generator[None, None, None]:
# Stage 2: Start HAProxy # Stage 2: Start HAProxy
print(" → Stage 2: Starting HAProxy...") print(" → Stage 2: Starting HAProxy...")
result = subprocess.run( 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, capture_output=True,
text=True, text=True,
check=True check=True
@ -945,7 +951,7 @@ def docker_compose_acme() -> Generator[None, None, None]:
# Stage 3: Start Backend # Stage 3: Start Backend
print(" → Stage 3: Starting backend...") print(" → Stage 3: Starting backend...")
result = subprocess.run( 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, capture_output=True,
text=True, text=True,
check=True check=True
@ -961,12 +967,15 @@ def docker_compose_acme() -> Generator[None, None, None]:
# Cleanup # Cleanup
print(" → Stopping ACME test environment...") print(" → Stopping ACME test environment...")
subprocess.run( 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, capture_output=True,
text=True text=True
) )
print(" ✓ Services stopped and cleaned up") print(" ✓ Services stopped and cleaned up")
# Restore original directory
os.chdir(original_dir)
# Clean up volume # Clean up volume
subprocess.run( subprocess.run(
["docker", "volume", "rm", volume_name], ["docker", "volume", "rm", volume_name],