[master] b6d0ff8 Merge tests and reshuffle things

Federico G. Schwindt fgsch at lodoss.net
Fri Jan 27 19:37:04 CET 2017


commit b6d0ff84fabfce8bffad426c02421eb891ef6a7b
Author: Federico G. Schwindt <fgsch at lodoss.net>
Date:   Fri Jan 27 18:35:22 2017 +0000

    Merge tests and reshuffle things

diff --git a/bin/varnishtest/tests/c00003.vtc b/bin/varnishtest/tests/c00003.vtc
index aa86907..270be73 100644
--- a/bin/varnishtest/tests/c00003.vtc
+++ b/bin/varnishtest/tests/c00003.vtc
@@ -1,4 +1,20 @@
-varnishtest "Check that we fail to start if any listen address does not work"
+varnishtest "Check that we fail to start with erroneous -a/-b arguments"
+
+server s1 {}
+varnish v1 -vcl+backend {} -start
+varnish v1 -stop
+
+# Duplicate -a arguments
+shell -err -expect "have same address" {
+	varnishd -d -a 127.0.0.1:${v1_port} -a 127.0.0.1:${v1_port} \
+	    -b localhost:80
+}
+
+# -a bad protocol specs
+shell -err -expect "Too many sub-arguments" \
+	"varnishd -a 127.0.0.1:80000,PROXY,FOO -d 2>&1"
+shell -err -expect "Too many sub-arguments" \
+	"varnishd -a 127.0.0.1:80000,HTTP/1,FOO -d 2>&1"
 
 # 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.
diff --git a/bin/varnishtest/tests/j00002.vtc b/bin/varnishtest/tests/j00002.vtc
deleted file mode 100644
index 274844c..0000000
--- a/bin/varnishtest/tests/j00002.vtc
+++ /dev/null
@@ -1,8 +0,0 @@
-varnishtest "-junix bad subarg handling"
-
-feature root
-
-shell -err -expect "unknown sub-argument" "varnishd -junix,bla=foo -f '' 2>&1"
-shell -err -expect "user not found" "varnishd -junix,user=/// -f '' 2>&1"
-shell -err -expect "user not found" "varnishd -junix,workuser=/// -f '' 2>&1"
-shell -err -expect "group not found" "varnishd -junix,ccgroup=/// -f '' 2>&1"
diff --git a/bin/varnishtest/tests/j00003.vtc b/bin/varnishtest/tests/j00003.vtc
index 56e43ee..e67589e 100644
--- a/bin/varnishtest/tests/j00003.vtc
+++ b/bin/varnishtest/tests/j00003.vtc
@@ -1,6 +1,12 @@
 varnishtest "-junix bad subarg handling"
 
 feature root
+
+shell -err -expect "unknown sub-argument" "varnishd -junix,bla=foo -f '' 2>&1"
+shell -err -expect "user not found" "varnishd -junix,user=/// -f '' 2>&1"
+shell -err -expect "user not found" "varnishd -junix,workuser=/// -f '' 2>&1"
+shell -err -expect "group not found" "varnishd -junix,ccgroup=/// -f '' 2>&1"
+
 feature user_varnish
 
 shell -err -expect "have different login groups" "varnishd -junix,workuser=root -f '' 2>&1"
diff --git a/bin/varnishtest/tests/r01770.vtc b/bin/varnishtest/tests/r01770.vtc
deleted file mode 100644
index de66aab..0000000
--- a/bin/varnishtest/tests/r01770.vtc
+++ /dev/null
@@ -1,4 +0,0 @@
-varnishtest "bad protocol specs for -a"
-
-shell -err -expect "Too many sub-arguments" "varnishd -a 127.0.0.1:80000,PROXY,FOO -d 2>&1"
-shell -err -expect "Too many sub-arguments" "varnishd -a 127.0.0.1:80000,HTTP/1,FOO -d 2>&1"
diff --git a/bin/varnishtest/tests/r01813.vtc b/bin/varnishtest/tests/r01813.vtc
deleted file mode 100644
index 7ed9ef8..0000000
--- a/bin/varnishtest/tests/r01813.vtc
+++ /dev/null
@@ -1,5 +0,0 @@
-varnishtest "Duplicate -a arguments"
-
-shell -err -match "(have same address)|(already in use)" {
-	varnishd -d -a 127.0.0.1:38484 -a 127.0.0.1:38484 -b localhost:80
-}



More information about the varnish-commit mailing list