From 04068a193916b6a187e8b3e6f1f74b4409664f9d Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Tue, 22 Oct 2019 13:06:59 +0200 Subject: [PATCH] REGTESTS: server/cli_set_fqdn requires version 1.8 minimum This test uses "set server fqdn" which is not available in 1.7. All reg-tests now pass on 1.7. --- reg-tests/checks/tcp-check_multiple_ports.vtc | 6 +++--- reg-tests/server/cli_set_fdqn.vtc | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/reg-tests/checks/tcp-check_multiple_ports.vtc b/reg-tests/checks/tcp-check_multiple_ports.vtc index da380a3bb..daa3c5f69 100644 --- a/reg-tests/checks/tcp-check_multiple_ports.vtc +++ b/reg-tests/checks/tcp-check_multiple_ports.vtc @@ -29,7 +29,7 @@ haproxy h1 -conf { timeout check 500ms timeout server 5s timeout client 5s - default-server check inter 200ms rise 1 fall 1 + #default-server check inter 200ms rise 1 fall 1 backend be1 log ${S1_addr}:${S1_port} len 2048 local0 @@ -37,7 +37,7 @@ haproxy h1 -conf { option log-health-checks tcp-check connect port ${s1_port} tcp-check connect port 1 - server srv1 ${s1_addr}:${s1_port} + server srv1 ${s1_addr}:${s1_port} check inter 200ms rise 1 fall 1 backend be2 log ${S2_addr}:${S2_port} len 2048 local0 @@ -45,7 +45,7 @@ haproxy h1 -conf { option log-health-checks tcp-check connect port 1 tcp-check connect port ${s1_port} - server srv1 ${s1_addr}:${s1_port} + server srv1 ${s1_addr}:${s1_port} check inter 200ms rise 1 fall 1 } -start syslog S1 -wait diff --git a/reg-tests/server/cli_set_fdqn.vtc b/reg-tests/server/cli_set_fdqn.vtc index cf6b809f1..b3b00c3e4 100644 --- a/reg-tests/server/cli_set_fdqn.vtc +++ b/reg-tests/server/cli_set_fdqn.vtc @@ -2,6 +2,8 @@ varnishtest "Set server FQDN via CLI crash" feature ignore_unknown_macro +# for "set server fqdn" +#REQUIRE_VERSION=1.8 #REGTEST_TYPE=bug # Do nothing. Is there only to create s1_* macros