From 8769e01f23a4e559f132cca8382fa6ea5808abd9 Mon Sep 17 00:00:00 2001 From: Alberto Bertogli Date: Sun, 22 Nov 2020 09:32:26 +0000 Subject: [PATCH] test: Update haproxy test config The haproxy test config includes an obsolete "debug" entry, and is missing some timeouts which, while harmless in this context, cause a warning that can be confusing. This patch fixes the debug entry by running haproxy -d as recommended, and adds the essential timeouts to avoid the warning. --- test/t-18-haproxy/haproxy.cfg | 6 +++--- test/t-18-haproxy/run.sh | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/t-18-haproxy/haproxy.cfg b/test/t-18-haproxy/haproxy.cfg index 90dafad..96047bc 100644 --- a/test/t-18-haproxy/haproxy.cfg +++ b/test/t-18-haproxy/haproxy.cfg @@ -1,7 +1,7 @@ -global - debug - listen smtp-in mode tcp bind *:1025 server srv1 localhost:2025 send-proxy + timeout connect 10s + timeout client 10s + timeout server 10s diff --git a/test/t-18-haproxy/run.sh b/test/t-18-haproxy/run.sh index 2bb7351..e2f0e9d 100755 --- a/test/t-18-haproxy/run.sh +++ b/test/t-18-haproxy/run.sh @@ -19,7 +19,7 @@ timeout 2m # Launch haproxy in the background, checking config first to fail fast in that # case. haproxy -f haproxy.cfg -c -haproxy -f haproxy.cfg > .logs/haproxy.log 2>&1 & +haproxy -f haproxy.cfg -d > .logs/haproxy.log 2>&1 & generate_certs_for testserver add_user user@testserver secretpassword