REGTESTS: silence the "log format ignored" warnings

Several tests were declaring a log format without having an explicit
log server configured, causing a warning. Let's clean them up.

diff --git a/reg-tests/checks/tls_health_checks.vtc b/reg-tests/checks/tls_health_checks.vtc
index 9c268f4858d1f7b17bb2a3305f01e07391b5159d..e94a2c719583928f6d61c9a642bd9c5b70001c2d 100644 (file)
--- a/reg-tests/checks/tls_health_checks.vtc
+++ b/reg-tests/checks/tls_health_checks.vtc
@@ -58,12 +58,10 @@ haproxy h1 -conf {
         use_backend be1
 
     frontend fe2
-        option tcplog
         bind "fd@${fe2}" ssl crt ${testdir}/common.pem
         use_backend be2
 
     frontend fe3
-        option httplog
         bind "fd@${fe3}" ssl crt ${testdir}/common.pem
         use_backend be3
 } -start

diff --git a/reg-tests/compression/lua_validation.vtc b/reg-tests/compression/lua_validation.vtc
index b10cbd93e71fdc51c555a653a72da3c55563d176..b238ce8e9520c91e9904148ffca0049c3b0cbb40 100644 (file)
--- a/reg-tests/compression/lua_validation.vtc
+++ b/reg-tests/compression/lua_validation.vtc
@@ -8,13 +8,10 @@ feature ignore_unknown_macro
 
 haproxy h1 -conf {
 global
-#      log stdout format short daemon
        lua-load                ${testdir}/lua_validation.lua
 
 defaults
        mode                    http
-       log                     global
-       option                  httplog
 
 frontend main-https
        bind                    "fd@${fe1}" ssl crt ${testdir}/common.pem

diff --git a/reg-tests/http-rules/converters_ipmask_concat_strcmp_field_word.vtc b/reg-tests/http-rules/converters_ipmask_concat_strcmp_field_word.vtc
index 55bcb5f9c7d7ade1826dc8f276dfd3d55576c3ce..f19b7c148b57db2ebb5f8c6d1a5c9082b9e2c711 100644 (file)
--- a/reg-tests/http-rules/converters_ipmask_concat_strcmp_field_word.vtc
+++ b/reg-tests/http-rules/converters_ipmask_concat_strcmp_field_word.vtc
@@ -75,8 +75,6 @@ server s2 {
 haproxy h1 -conf {
   defaults
     mode http
-    log global
-    option httplog
     timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
     timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
     timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
@@ -136,8 +134,6 @@ haproxy h1 -conf {
 haproxy h2 -conf {
   defaults
     mode http
-    log global
-    option httplog
     timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
     timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
     timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"

diff --git a/reg-tests/http-rules/map_redirect.vtc b/reg-tests/http-rules/map_redirect.vtc
index f55e0d82555294865911f3b0fa75afe3935c1e57..e8ed0336399c022a5a5e8ccb6c503225b424f508 100644 (file)
--- a/reg-tests/http-rules/map_redirect.vtc
+++ b/reg-tests/http-rules/map_redirect.vtc
@@ -35,7 +35,6 @@ haproxy h1 -conf {
   defaults
     mode http
     log global
-    option httplog
     timeout connect  "${HAPROXY_TEST_TIMEOUT-5s}"
     timeout client   "${HAPROXY_TEST_TIMEOUT-5s}"
     timeout server   "${HAPROXY_TEST_TIMEOUT-5s}"
@@ -63,7 +62,7 @@ haproxy h1 -conf {
 
     default_backend be1
 
-    backend be1
+  backend be1
     http-request redirect prefix %[var(txn.testvar)] code 301 if { var(txn.testvar) -m found }
     http-request deny
 

diff --git a/reg-tests/sample_fetches/acl.vtc b/reg-tests/sample_fetches/acl.vtc
index 905ae3ecf474c36d2ab33c42217a620349cc3633..21e6f4b52417a700bc75f153890afa46280d5f6a 100644 (file)
--- a/reg-tests/sample_fetches/acl.vtc
+++ b/reg-tests/sample_fetches/acl.vtc
@@ -19,8 +19,6 @@ haproxy h1 -conf {
         acl ACL4 acl(ACL2,!ACL3)
 
         http-request return status 200 hdr x-acl "ACL1=%[acl(ACL1)] ACL2=%[acl(ACL2)] ACL3=%[acl(ACL3)] ACL4=%[acl(ACL4)] TRUE=%[acl(TRUE)]"
-
-        log-format ACL1=%[acl(ACL1)]
 } -start
 
 client c1 -connect ${h1_fe1_sock} {

diff --git a/reg-tests/seamless-reload/abns_socket.vtc b/reg-tests/seamless-reload/abns_socket.vtc
index 4a266afb82ff0599277bb5d78daa6df9c1cdd5cf..3686a1f65f1d29f5b3075c49f7c6299a2a735342 100644 (file)
--- a/reg-tests/seamless-reload/abns_socket.vtc
+++ b/reg-tests/seamless-reload/abns_socket.vtc
@@ -29,8 +29,6 @@ haproxy h1 -W -S -conf {
 
   defaults
     mode http
-    log global
-    option httplog
     timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
     timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
     timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"

diff --git a/reg-tests/server/abnsz.vtc b/reg-tests/server/abnsz.vtc
index 072cba98a532f5d3f6d4606f16794e96253ee7bd..164d17274c697cc66d0fb73c4827999be444f078 100644 (file)
--- a/reg-tests/server/abnsz.vtc
+++ b/reg-tests/server/abnsz.vtc
@@ -12,8 +12,6 @@ haproxy h1 -W -S -conf {
 
   defaults
     mode http
-    log global
-    option httplog
     timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
     timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
     timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"