[master] dc7e849fe Dont depend on `accept_filter` parameter being settable

Poul-Henning Kamp phk at FreeBSD.org
Tue Aug 17 08:34:05 UTC 2021


commit dc7e849fe1d4d02087558b3eed8b3f26d814b706
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue Aug 17 08:33:02 2021 +0000

    Dont depend on `accept_filter` parameter being settable

diff --git a/bin/varnishtest/tests/b00046.vtc b/bin/varnishtest/tests/b00046.vtc
index abf5663d5..bcdecf271 100644
--- a/bin/varnishtest/tests/b00046.vtc
+++ b/bin/varnishtest/tests/b00046.vtc
@@ -12,7 +12,9 @@ server s1 {
 	send_urgent " "
 } -start
 
-varnish v1 -cliok "param.set accept_filter off"
+# -cli because accept_filter may not be supported
+varnish v1 -cli "param.set accept_filter off"
+
 varnish v1 -vcl+backend {} -start
 
 client c1 {
diff --git a/bin/varnishtest/tests/r01914.vtc b/bin/varnishtest/tests/r01914.vtc
index 753051893..a86736ce2 100644
--- a/bin/varnishtest/tests/r01914.vtc
+++ b/bin/varnishtest/tests/r01914.vtc
@@ -13,7 +13,6 @@ varnish v1 \
     -arg "-s default,1MB" \
     -arg "-s default,1MB" \
     -arg "-s Transient=default" \
-    -arg "-p accept_filter=off" \
     -syntax 4.0 \
     -vcl+backend {
 	import std;
@@ -29,7 +28,12 @@ varnish v1 \
 	sub vcl_backend_response {
 		set beresp.storage = storage.s0;
 	}
-} -start
+}
+
+# -cli because accept_filter may not be supported
+varnish v1 -cli "param.set accept_filter off"
+
+varnish v1 -start
 
 client c1 {
 	txreq -url /0 -bodylen 100
diff --git a/bin/varnishtest/tests/r02105.vtc b/bin/varnishtest/tests/r02105.vtc
index 4dd2c9a28..4eddec94f 100644
--- a/bin/varnishtest/tests/r02105.vtc
+++ b/bin/varnishtest/tests/r02105.vtc
@@ -9,7 +9,9 @@ server s1 {
 	txresp
 } -start
 
-varnish v1 -cliok "param.set accept_filter off"
+# -cli because accept_filter may not be supported
+varnish v1 -cli "param.set accept_filter off"
+
 varnish v1 -vcl+backend {
 	sub vcl_backend_response {
 		set beresp.ttl = 0.5s;
diff --git a/bin/varnishtest/tests/r02266.vtc b/bin/varnishtest/tests/r02266.vtc
index c0f4c9d18..068881313 100644
--- a/bin/varnishtest/tests/r02266.vtc
+++ b/bin/varnishtest/tests/r02266.vtc
@@ -16,7 +16,9 @@ server s1 {
 	send "line2\n"
 } -start
 
-varnish v1 -cliok "param.set accept_filter off"
+# -cli because accept_filter may not be supported
+varnish v1 -cli "param.set accept_filter off"
+
 varnish v1 -vcl+backend {
 	sub vcl_backend_response {
 		set beresp.do_stream = false;


More information about the varnish-commit mailing list