From 85a813676fe13031852d401f3803bbc511935983 Mon Sep 17 00:00:00 2001 From: Christopher Faulet Date: Tue, 15 Dec 2020 17:13:39 +0100 Subject: [PATCH] REGTESTS: Fix required versions for several scripts The following scripts require HAProxy 2.4 : * cache/caching_rules.vtc * cache/post_on_entry.vtc * cache/vary.vtc * checks/1be_40srv_odd_health_checks.vtc * checks/40be_2srv_odd_health_checks.vtc * checks/4be_1srv_health_checks.vtc * converter/fix.vtc * converter/mqtt.vtc * http-messaging/protocol_upgrade.vtc * http-messaging/websocket.vtc * http-set-timeout/set_timeout.vtc * log/log_uri.vtc However it may change is features are backported. --- reg-tests/cache/caching_rules.vtc | 2 +- reg-tests/cache/post_on_entry.vtc | 2 +- reg-tests/cache/vary.vtc | 2 +- reg-tests/checks/1be_40srv_odd_health_checks.vtc | 2 +- reg-tests/checks/40be_2srv_odd_health_checks.vtc | 2 +- reg-tests/checks/4be_1srv_health_checks.vtc | 2 +- reg-tests/converter/fix.vtc | 2 +- reg-tests/converter/mqtt.vtc | 2 +- reg-tests/http-messaging/protocol_upgrade.vtc | 2 ++ reg-tests/http-messaging/websocket.vtc | 2 ++ reg-tests/http-set-timeout/set_timeout.vtc | 2 ++ reg-tests/log/log_uri.vtc | 2 ++ 12 files changed, 16 insertions(+), 8 deletions(-) diff --git a/reg-tests/cache/caching_rules.vtc b/reg-tests/cache/caching_rules.vtc index ccbead7c1..c20a720e3 100644 --- a/reg-tests/cache/caching_rules.vtc +++ b/reg-tests/cache/caching_rules.vtc @@ -2,7 +2,7 @@ varnishtest "Caching rules test" # A response will not be cached unless it has an explicit age (Cache-Control max-age of s-maxage, Expires) or a validator (Last-Modified, or ETag) # A response will not be cached either if it has an Age header that is either invalid (should be an integer) or greater than its max age. -#REQUIRE_VERSION=1.9 +#REQUIRE_VERSION=2.4 feature ignore_unknown_macro diff --git a/reg-tests/cache/post_on_entry.vtc b/reg-tests/cache/post_on_entry.vtc index 2b807f693..db6414ed4 100644 --- a/reg-tests/cache/post_on_entry.vtc +++ b/reg-tests/cache/post_on_entry.vtc @@ -1,6 +1,6 @@ varnishtest "A successful unsafe method (POST for instance) on a cached entry must disable it." -#REQUIRE_VERSION=2.3 +#REQUIRE_VERSION=2.4 feature ignore_unknown_macro diff --git a/reg-tests/cache/vary.vtc b/reg-tests/cache/vary.vtc index fc2c4456b..f3425d002 100644 --- a/reg-tests/cache/vary.vtc +++ b/reg-tests/cache/vary.vtc @@ -1,6 +1,6 @@ varnishtest "Vary support" -#REQUIRE_VERSION=2.3 +#REQUIRE_VERSION=2.4 feature ignore_unknown_macro diff --git a/reg-tests/checks/1be_40srv_odd_health_checks.vtc b/reg-tests/checks/1be_40srv_odd_health_checks.vtc index 7e8e43164..bd07d8840 100644 --- a/reg-tests/checks/1be_40srv_odd_health_checks.vtc +++ b/reg-tests/checks/1be_40srv_odd_health_checks.vtc @@ -6,7 +6,7 @@ feature ignore_unknown_macro # The first health-checks passed tests are checked for all these servers # thanks to syslog messages. -#REQUIRE_VERSION=1.8 +#REQUIRE_VERSION=2.4 #EXCLUDE_TARGETS=freebsd #REGTEST_TYPE=slow diff --git a/reg-tests/checks/40be_2srv_odd_health_checks.vtc b/reg-tests/checks/40be_2srv_odd_health_checks.vtc index fb229593c..d1cabbc7e 100644 --- a/reg-tests/checks/40be_2srv_odd_health_checks.vtc +++ b/reg-tests/checks/40be_2srv_odd_health_checks.vtc @@ -1,7 +1,7 @@ varnishtest "Health-checks" feature ignore_unknown_macro -#REQUIRE_VERSION=1.8 +#REQUIRE_VERSION=2.4 #EXCLUDE_TARGETS=freebsd,osx,generic #REGTEST_TYPE=slow diff --git a/reg-tests/checks/4be_1srv_health_checks.vtc b/reg-tests/checks/4be_1srv_health_checks.vtc index b8bd1051a..22524905f 100644 --- a/reg-tests/checks/4be_1srv_health_checks.vtc +++ b/reg-tests/checks/4be_1srv_health_checks.vtc @@ -1,7 +1,7 @@ varnishtest "Health-check test" feature ignore_unknown_macro -#REQUIRE_VERSION=1.8 +#REQUIRE_VERSION=2.4 #EXCLUDE_TARGETS=freebsd #REGTEST_TYPE=slow diff --git a/reg-tests/converter/fix.vtc b/reg-tests/converter/fix.vtc index 6d6ea6f0a..8bddc4d8f 100644 --- a/reg-tests/converter/fix.vtc +++ b/reg-tests/converter/fix.vtc @@ -1,5 +1,5 @@ varnishtest "fix converters Test" -#REQUIRE_VERSION=2.3 +#REQUIRE_VERSION=2.4 feature ignore_unknown_macro diff --git a/reg-tests/converter/mqtt.vtc b/reg-tests/converter/mqtt.vtc index 7d179ab9b..15d03ed7a 100644 --- a/reg-tests/converter/mqtt.vtc +++ b/reg-tests/converter/mqtt.vtc @@ -1,5 +1,5 @@ varnishtest "mqtt converters Test" -#REQUIRE_VERSION=2.3 +#REQUIRE_VERSION=2.4 feature ignore_unknown_macro diff --git a/reg-tests/http-messaging/protocol_upgrade.vtc b/reg-tests/http-messaging/protocol_upgrade.vtc index 18e5afee6..753aafe27 100644 --- a/reg-tests/http-messaging/protocol_upgrade.vtc +++ b/reg-tests/http-messaging/protocol_upgrade.vtc @@ -8,6 +8,8 @@ varnishtest "h1/h2 support for protocol upgrade test" feature ignore_unknown_macro +#REQUIRE_VERSION=2.4 + # http/1.1 server server srv_h1 { rxreq diff --git a/reg-tests/http-messaging/websocket.vtc b/reg-tests/http-messaging/websocket.vtc index 82f5e8b03..576c89d68 100644 --- a/reg-tests/http-messaging/websocket.vtc +++ b/reg-tests/http-messaging/websocket.vtc @@ -12,6 +12,8 @@ varnishtest "WebSocket test" feature ignore_unknown_macro +#REQUIRE_VERSION=2.4 + # valid websocket server server s1 { rxreq diff --git a/reg-tests/http-set-timeout/set_timeout.vtc b/reg-tests/http-set-timeout/set_timeout.vtc index 4847b80b1..6840164a9 100644 --- a/reg-tests/http-set-timeout/set_timeout.vtc +++ b/reg-tests/http-set-timeout/set_timeout.vtc @@ -2,6 +2,8 @@ varnishtest "http-request set-timeout test" feature ignore_unknown_macro +#REQUIRE_VERSION=2.4 + server srv_h1 -repeat 3 { rxreq txresp diff --git a/reg-tests/log/log_uri.vtc b/reg-tests/log/log_uri.vtc index 00f0553d3..b5a5753fb 100644 --- a/reg-tests/log/log_uri.vtc +++ b/reg-tests/log/log_uri.vtc @@ -1,6 +1,8 @@ varnishtest "Verify logging of relative/absolute URI path" feature ignore_unknown_macro +#REQUIRE_VERSION=2.4 + server s1 { rxreq txresp