From 2808e3577fb72b693198c3f4e8f9284cb69675b3 Mon Sep 17 00:00:00 2001 From: Christopher Faulet Date: Mon, 26 May 2025 07:57:21 +0200 Subject: [PATCH] REGTESTS: Explicitly allow failing shell commands in some scripts Vtest2, that should replaced Vtest in few months, will reject any failing commands in shell blocks. However, some scripts are executing some commands, expecting an error to be able to parse the error output. So, now use "set +e" in those scripts to explicitly state failing commads are expected. It is just used for non-final commands. At the end, the shell block must still report a success. --- reg-tests/lua/close_wait_lf.vtc | 1 + reg-tests/ssl/ocsp_compat_check.vtc | 12 ++++++++++++ 2 files changed, 13 insertions(+) diff --git a/reg-tests/lua/close_wait_lf.vtc b/reg-tests/lua/close_wait_lf.vtc index 0a2c40d3af..9e2230a2cf 100644 --- a/reg-tests/lua/close_wait_lf.vtc +++ b/reg-tests/lua/close_wait_lf.vtc @@ -49,6 +49,7 @@ client c1 -connect ${h1_frt_sock} -repeat 100 { syslog Slog -wait shell { + set +e ss -pt | grep CLOSE-WAIT.*haproxy.*pid=${h1_pid} exit $((!$?)) } diff --git a/reg-tests/ssl/ocsp_compat_check.vtc b/reg-tests/ssl/ocsp_compat_check.vtc index 7dbcdf94b0..f96fedef4c 100644 --- a/reg-tests/ssl/ocsp_compat_check.vtc +++ b/reg-tests/ssl/ocsp_compat_check.vtc @@ -47,6 +47,7 @@ listen ssl-lst server s1 127.0.0.1:80 EOF + set +e haproxy_output="$($HAPROXY_PROGRAM -f ${tmpdir}/ocsp_compat_check.cfg -c 2>&1)" haproxy_ret=$? echo "==== test 1" @@ -77,6 +78,7 @@ listen ssl-lst server s1 127.0.0.1:80 EOF + set +e haproxy_output="$($HAPROXY_PROGRAM -f ${tmpdir}/ocsp_compat_check.cfg -c 2>&1)" haproxy_ret=$? echo "==== test 2" @@ -107,6 +109,7 @@ listen ssl-lst server s1 127.0.0.1:80 EOF + set +e haproxy_output="$($HAPROXY_PROGRAM -f ${tmpdir}/ocsp_compat_check.cfg -c 2>&1)" haproxy_ret=$? echo "==== test 3" @@ -138,6 +141,7 @@ listen ssl-lst server s1 127.0.0.1:80 EOF + set +e haproxy_output="$($HAPROXY_PROGRAM -f ${tmpdir}/ocsp_compat_check.cfg -c 2>&1)" haproxy_ret=$? echo "==== test 4" @@ -169,6 +173,7 @@ listen ssl-lst server s1 127.0.0.1:80 EOF + set +e haproxy_output="$($HAPROXY_PROGRAM -f ${tmpdir}/ocsp_compat_check.cfg -c 2>&1)" haproxy_ret=$? echo "==== test 5" @@ -200,6 +205,7 @@ listen ssl-lst server s1 127.0.0.1:80 EOF + set +e haproxy_output="$($HAPROXY_PROGRAM -f ${tmpdir}/ocsp_compat_check.cfg -c 2>&1)" haproxy_ret=$? echo "==== test 6" @@ -232,6 +238,7 @@ listen ssl-lst server s1 127.0.0.1:80 EOF + set +e haproxy_output="$($HAPROXY_PROGRAM -f ${tmpdir}/ocsp_compat_check.cfg -c 2>&1)" haproxy_ret=$? echo "==== test 7" @@ -263,6 +270,7 @@ listen ssl-lst server s1 127.0.0.1:80 EOF + set +e haproxy_output="$($HAPROXY_PROGRAM -f ${tmpdir}/ocsp_compat_check.cfg -c 2>&1)" haproxy_ret=$? echo "==== test 8" @@ -295,6 +303,7 @@ listen ssl-lst server s1 127.0.0.1:80 EOF + set +e haproxy_output="$($HAPROXY_PROGRAM -f ${tmpdir}/ocsp_compat_check.cfg -c 2>&1)" haproxy_ret=$? echo "==== test 9" @@ -327,6 +336,7 @@ listen ssl-lst server s1 127.0.0.1:80 EOF + set +e haproxy_output="$($HAPROXY_PROGRAM -f ${tmpdir}/ocsp_compat_check.cfg -c 2>&1)" haproxy_ret=$? echo "==== test 10" @@ -359,6 +369,7 @@ listen ssl-lst server s1 127.0.0.1:80 EOF + set +e haproxy_output="$($HAPROXY_PROGRAM -f ${tmpdir}/ocsp_compat_check.cfg -c 2>&1)" haproxy_ret=$? echo "==== test 11" @@ -391,6 +402,7 @@ listen ssl-lst server s1 127.0.0.1:80 EOF + set +e haproxy_output="$($HAPROXY_PROGRAM -f ${tmpdir}/ocsp_compat_check.cfg -c 2>&1)" haproxy_ret=$? echo "==== test 12" -- 2.39.5