From: Christopher Faulet Date: Wed, 6 May 2020 09:10:51 +0000 (+0200) Subject: REGTEST: checks: Adapt SSL error message reported when connection is rejected X-Git-Tag: v2.2-dev8~116 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8d38f0affdbf1b3e558602ce6551dcc1cdb8c958;p=thirdparty%2Fhaproxy.git REGTEST: checks: Adapt SSL error message reported when connection is rejected Depending on the SSL library version, the reported error may differ when the connection is rejected during the handshake. An empty handshke may be detected or just an generic handshake error. So tcp-check-ssl.vtc has been adapted to support both error messages. --- diff --git a/reg-tests/checks/tcp-check-ssl.vtc b/reg-tests/checks/tcp-check-ssl.vtc index e5863580cf..149bf7a039 100644 --- a/reg-tests/checks/tcp-check-ssl.vtc +++ b/reg-tests/checks/tcp-check-ssl.vtc @@ -32,14 +32,14 @@ syslog S3 -level notice { recv expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Proxy be3 started." recv - expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Health check for server be3/srv failed, reason: Layer6 invalid response.+info: \"SSL handshake failure\".+check duration: [[:digit:]]+ms, status: 0/1 DOWN." + expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Health check for server be3/srv failed, reason: Layer6 invalid response.+info: \"(Connection closed during SSL handshake|SSL handshake failure)\".+check duration: [[:digit:]]+ms, status: 0/1 DOWN." } -start syslog S4 -level notice { recv expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Proxy be4 started." recv - expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Health check for server be4/srv failed, reason: Layer6 invalid response.+info: \"SSL handshake failure at step 1 of tcp-check \\(connect\\)\".+check duration: [[:digit:]]+ms, status: 0/1 DOWN." + expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Health check for server be4/srv failed, reason: Layer6 invalid response.+info: \"(Connection closed during SSL handshake|SSL handshake failure) at step 1 of tcp-check \\(connect\\)\".+check duration: [[:digit:]]+ms, status: 0/1 DOWN." } -start