1
0
Fork 0

Fix build error

This commit is contained in:
Joao Gilberto Magalhaes 2026-02-20 14:46:39 -05:00
parent 4b7f42473a
commit 580c90440e

View file

@ -1078,10 +1078,29 @@ class TestTLSService:
"""Test HTTPS request via ingress with host2.local""" """Test HTTPS request via ingress with host2.local"""
kubectl = k8s_service_tls kubectl = k8s_service_tls
# Wait for EasyHAProxy to discover and fully configure the ingress # Wait for EasyHAProxy to discover and fully configure the ingress (checks HTTP)
assert wait_for_easyhaproxy_discovery(kubectl, "host2.local", timeout=30), \ assert wait_for_easyhaproxy_discovery(kubectl, "host2.local", timeout=30), \
"EasyHAProxy did not become ready for host2.local within 30 seconds" "EasyHAProxy did not become ready for host2.local within 30 seconds"
# HTTP readiness does not guarantee HTTPS is ready: the TLS frontend (port 443)
# may still be initialising or HAProxy may be mid-reload after writing the cert
# file. Poll HTTPS directly until it returns a real response before asserting.
deadline = time.time() + 30
while time.time() < deadline:
try:
probe = subprocess.run(
["curl", "-k", "-s", "-o", "/dev/null", "-w", "%{http_code}",
"-H", "Host: host2.local", f"https://localhost:{HTTPS_PORT}"],
capture_output=True,
text=True,
timeout=5
)
if probe.stdout.strip() not in ("000", "503"):
break
except Exception:
pass
time.sleep(1)
# Test HTTPS request (using -k to allow self-signed certificate) # Test HTTPS request (using -k to allow self-signed certificate)
result = subprocess.run( result = subprocess.run(
["curl", "-k", "-s", "-H", "Host: host2.local", f"https://localhost:{HTTPS_PORT}"], ["curl", "-k", "-s", "-H", "Host: host2.local", f"https://localhost:{HTTPS_PORT}"],