[master] 4666acd Eliminate use of $listen_address in these two tests.

Poul-Henning Kamp phk at FreeBSD.org
Thu Mar 12 16:02:21 CET 2015


commit 4666acdf350d008ca7d4acce46b57362286ece26
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Thu Mar 12 15:02:03 2015 +0000

    Eliminate use of $listen_address in these two tests.

diff --git a/bin/varnishtest/tests/b00042.vtc b/bin/varnishtest/tests/b00042.vtc
index 0c48a17..9fa143e 100644
--- a/bin/varnishtest/tests/b00042.vtc
+++ b/bin/varnishtest/tests/b00042.vtc
@@ -22,9 +22,6 @@ varnish v1 -clierr "106" "param.set workspace_thread 1x"
 varnish v1 -clierr "106" "param.set workspace_thread x"
 varnish v1 -clierr "106" "param.set user ///"
 varnish v1 -clierr "106" "param.set user ///"
-varnish v1 -clierr "106" {param.set listen_address ""}
-varnish v1 -clierr "106" {param.set listen_address "&&"}
-varnish v1 -clierr "106" {param.set listen_address "\""}
 varnish v1 -clierr "106" {param.set pool_sess "\""}
 varnish v1 -clierr "200" {param.set thread_pool_max 110}
 varnish v1 -clierr "106" {param.set thread_pool_min 111}
diff --git a/bin/varnishtest/tests/c00003.vtc b/bin/varnishtest/tests/c00003.vtc
index 9e811b6..98573f3 100644
--- a/bin/varnishtest/tests/c00003.vtc
+++ b/bin/varnishtest/tests/c00003.vtc
@@ -1,20 +1,10 @@
-varnishtest "Check that we start if at least one listen address works"
-
-server s1 {
-	rxreq
-	txresp -hdr "Connection: close" -body "012345\n"
-} -start
+varnishtest "Check that we fail to start if any listen address does not work"
 
 # This requires non-local binds to be disabled.  If you see this fail
 # and are on Linux, ensure /proc/net/ipv4/ip_nonlocal_bind is set to 0.
-varnish v1 -cliok "param.set listen_address ${bad_ip}:0"
-varnish v1 -vcl+backend {} -clierr 300 start
 
-varnish v1 -cliok "param.set listen_address 127.0.0.1:0,${bad_ip}:9082"
-varnish v1 -start
+# All bad listen addresses
+err_shell "Failed to open (any) accept sockets" {${varnishd} -a "${bad_ip}:0" -n ${tmpdir} 2>&1}
 
-client c1 {
-	txreq -url "/"
-	rxresp
-	expect resp.status == 200
-} -run
+# Just one bad listen addresses
+# err_shell "Invalid listen address" {${varnishd} -a "127.0.0.1:0,${bad_ip}:0" -n ${tmpdir} 2>&1}



More information about the varnish-commit mailing list