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.

diff --git a/reg-tests/cache/caching_rules.vtc b/reg-tests/cache/caching_rules.vtc
index ccbead7c126df0d2dce4d4143dbc588f71fac48f..c20a720e3cc2fac4a7d17c4e0ba7a2f993bfd5e0 100644 (file)
--- 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 2b807f69360bc04a59c870f4b4eca5be4153b3a6..db6414ed40cca05128855730d9a55698148320eb 100644 (file)
--- 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 fc2c4456b824509ce6fa304f7ed1cde9ea796327..f3425d00212521cee3c53029648cdc1381809b9c 100644 (file)
--- 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 7e8e43164f2fdb0e1c1e63849958e72390b2ebe1..bd07d8840884e7a5157678330df8df49a7947eb5 100644 (file)
--- 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 fb229593cf77908e8b5e04355e6bd658298b63fa..d1cabbc7e274131480f91eda916d2c264f732e7d 100644 (file)
--- 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 b8bd1051a2ada5360448584cfaeeea18a6e8d779..22524905f7d497bace0d21af374dcd6823a29eba 100644 (file)
--- 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 6d6ea6f0a92ba99b7989a47f4e7b6df975a4eeef..8bddc4d8ff038a68326198b07a572cc265519546 100644 (file)
--- 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 7d179ab9ba82e824a78cde473e101014989dd20b..15d03ed7a27f356bdbde1d04cc5ac59ac7a6908e 100644 (file)
--- 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 18e5afee6a6dbcb74e7c31120d94b0fa919c9006..753aafe2784ec9d0028934cc3cbca1953be5e604 100644 (file)
--- 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 82f5e8b0350657bbde39d62641e7aebcfd663fa7..576c89d68136e44027aa7d2c12c1f71683e07478 100644 (file)
--- 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 4847b80b13bf4b7b4d7dafd8f3585d44aff2d8a5..6840164a97a3f0c23703476cd89ad5e7affe0817 100644 (file)
--- 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 00f0553d3aa2aced92871798e7c2aa865354e5f1..b5a5753fb01b25b7cc755340b4e85af3ca8a64e5 100644 (file)
--- 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