From 00b7bac5c0db2217986dccfb6929f281446f7be3 Mon Sep 17 00:00:00 2001
From: Joao Gilberto Magalhaes <joao@byjg.com.br>
Date: Sun, 22 Feb 2026 20:51:16 -0500
Subject: [PATCH] Configure HAProxy stats and improve test fixture cleanup
 logic

- Set up HAProxy stats environment variables (`HAPROXY_USERNAME`, `HAPROXY_PASSWORD`, `HAPROXY_STATS_PORT`) for monitoring.
- Updated test fixture to ensure robust cleanup with try-finally blocks.
---
 tests_e2e/docker/docker-compose-acme-e2e.yml |  4 ++++
 tests_e2e/test_docker_compose.py             | 25 ++++++++++++--------
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/tests_e2e/docker/docker-compose-acme-e2e.yml b/tests_e2e/docker/docker-compose-acme-e2e.yml
index 557d469..1dcd147 100644
--- a/tests_e2e/docker/docker-compose-acme-e2e.yml
+++ b/tests_e2e/docker/docker-compose-acme-e2e.yml
@@ -94,6 +94,7 @@ services:
 
   # EasyHAProxy with Certbot
   haproxy:
+    image: byjg/easy-haproxy:local
     build:
       context: ../..
       dockerfile: deploy/docker/Dockerfile
@@ -111,6 +112,9 @@ services:
     environment:
       EASYHAPROXY_DISCOVER: docker
       HAPROXY_CUSTOMERRORS: "true"
+      HAPROXY_USERNAME: admin
+      HAPROXY_PASSWORD: password
+      HAPROXY_STATS_PORT: 1936
 
       # Certbot configuration pointing to Pebble
       EASYHAPROXY_CERTBOT_EMAIL: test@example.com
diff --git a/tests_e2e/test_docker_compose.py b/tests_e2e/test_docker_compose.py
index 3d287a4..5e9b419 100644
--- a/tests_e2e/test_docker_compose.py
+++ b/tests_e2e/test_docker_compose.py
@@ -842,16 +842,21 @@ def docker_compose_acme() -> Generator[None, None, None]:
     )
 
     fixture = DockerComposeFixture(str(DOCKER_DIR / "docker-compose-acme-e2e.yml"), startup_wait=0)
-    fixture.up()
-    yield
-    fixture.down()
-
-    # Clean up volume after test
-    subprocess.run(
-        ["docker", "volume", "rm", volume_name],
-        stdout=subprocess.DEVNULL,
-        stderr=subprocess.DEVNULL
-    )
+    try:
+        fixture.up()
+    except Exception:
+        fixture.down()
+        raise
+    try:
+        yield
+    finally:
+        fixture.down()
+        # Clean up volume after test
+        subprocess.run(
+            ["docker", "volume", "rm", volume_name],
+            stdout=subprocess.DEVNULL,
+            stderr=subprocess.DEVNULL
+        )
 
 
 @pytest.mark.acme