[master] 9a652c7 Schedule this (slow) test to run a bit earlier

[Federico G. Schwindt]

commit 9a652c7c3a879695d9495e10928366b1c910c3e3
Author: Federico G. Schwindt <fgsch at lodoss.net>
Date:   Fri Jan 27 18:54:11 2017 +0000

    Schedule this (slow) test to run a bit earlier

diff --git a/bin/varnishtest/tests/s00005.vtc b/bin/varnishtest/tests/s00005.vtc
new file mode 100644
index 0000000..67cd3a9
--- /dev/null
+++ b/bin/varnishtest/tests/s00005.vtc
@@ -0,0 +1,129 @@
+varnishtest "Test VCL labels"
+
+server s1 {
+	rxreq
+	txresp
+} -start
+
+varnish v1 -vcl+backend {}
+
+# VCL name must be C-names
+varnish v1 -clierr 106 {vcl.inline 0000 "vcl 4.0; backend b { .host = \"localhost\";} "}
+varnish v1 -clierr 106 {vcl.inline a00/ "vcl 4.0; backend b { .host = \"localhost\";} "}
+varnish v1 -clierr 106 {vcl.inline a00å "vcl 4.0; backend b { .host = \"localhost\";} "}
+
+varnish v1 -vcl+backend {
+	sub vcl_recv {
+		return (synth(400));
+	}
+}
+
+varnish v1 -start
+
+client c1 {
+	txreq
+	rxresp
+	expect resp.status == 400
+} -run
+
+varnish v1 -cliok "vcl.use vcl1"
+
+client c1 {
+	txreq
+	rxresp
+	expect resp.status == 200
+} -run
+
+varnish v1 -cliok "vcl.list"
+varnish v1 -clierr 106 "vcl.label foo vcl0"
+varnish v1 -cliok "vcl.label foo vcl2"
+varnish v1 -cliok "vcl.label bar vcl2"
+varnish v1 -cliok "vcl.list"
+varnish v1 -clierr 300 "vcl.discard vcl2"
+varnish v1 -cliok "vcl.discard bar"
+varnish v1 -cliok "vcl.label foo vcl1"
+varnish v1 -clierr 106 "vcl.label vcl1 vcl2"
+varnish v1 -clierr 106 "vcl.state foo cold"
+varnish v1 -clierr 300 "vcl.label bar foo"
+varnish v1 -clierr 300 "vcl.discard vcl1"
+varnish v1 -cliok "vcl.list"
+varnish v1 -cliok "vcl.use foo"
+varnish v1 -clierr 300 "vcl.discard foo"
+varnish v1 -cliok "vcl.list"
+
+client c1 -run
+
+varnish v1 -cliok "vcl.label foo vcl2"
+
+client c1 {
+	txreq
+	rxresp
+	expect resp.status == 400
+} -run
+
+varnish v1 -cliok "vcl.use vcl1"
+varnish v1 -cliok "vcl.list"
+
+client c1 {
+	txreq
+	rxresp
+	expect resp.status == 200
+} -run
+
+varnish v1 -cliok "vcl.discard foo"
+varnish v1 -clierr 106 "vcl.discard foo"
+
+varnish v1 -stop
+varnish v1 -cliok "vcl.list"
+varnish v1 -clierr 106 "vcl.label fo- vcl0"
+varnish v1 -cliok "vcl.label fo- vcl1"
+varnish v1 -clierr 300 "vcl.label bar fo-"
+varnish v1 -clierr 200 "vcl.state vcl1 warm"
+varnish v1 -clierr 200 "vcl.state vcl1 auto"
+varnish v1 -clierr 300 "vcl.state vcl1 cold"
+varnish v1 -clierr 300 "vcl.discard vcl1"
+varnish v1 -cliok "vcl.list"
+varnish v1 -cliok "vcl.use fo-"
+varnish v1 -clierr 300 "vcl.discard fo-"
+varnish v1 -cliok "vcl.list"
+
+server s1 -start
+
+varnish v1 -start
+client c1 -run
+varnish v1 -stop
+varnish v1 -cliok "vcl.use vcl1"
+varnish v1 -cliok "vcl.discard fo-"
+varnish v1 -clierr 106 "vcl.discard fo-"
+
+varnish v1 -cliok "vcl.label label1 vcl1"
+varnish v1 -cliok "vcl.label label2 vcl1"
+varnish v1 -cliok "vcl.label label3 vcl1"
+varnish v1 -cliok "vcl.list"
+
+varnish v1 -start
+varnish v1 -cliok "vcl.list"
+varnish v1 -cliok "vcl.label snarf vcl1"
+server s1 -start
+client c1 -run
+
+# Test loop detection
+#######################################################################
+
+varnish v1 -cliok vcl.list
+
+varnish v1 -vcl+backend { }
+
+varnish v1 -cliok "vcl.label lblA vcl3"
+
+varnish v1 -vcl+backend { sub vcl_recv { return (vcl(lblA)); } }
+
+varnish v1 -cliok "vcl.label lblB vcl4"
+
+varnish v1 -vcl+backend { sub vcl_recv { return (vcl(lblB)); } }
+
+varnish v1 -clierr 106 "vcl.label lblA vcl5"
+varnish v1 -cliexpect \
+	{can only be used from the active VCL} \
+	{vcl.label lblA vcl5}
+
diff --git a/bin/varnishtest/tests/v00048.vtc b/bin/varnishtest/tests/v00048.vtc
deleted file mode 100644
index 67cd3a9..0000000
--- a/bin/varnishtest/tests/v00048.vtc
+++ /dev/null
@@ -1,129 +0,0 @@
-varnishtest "Test VCL labels"
-
-server s1 {
-	rxreq
-	txresp
-} -start
-
-varnish v1 -vcl+backend {}
-
-# VCL name must be C-names
-varnish v1 -clierr 106 {vcl.inline 0000 "vcl 4.0; backend b { .host = \"localhost\";} "}
-varnish v1 -clierr 106 {vcl.inline a00/ "vcl 4.0; backend b { .host = \"localhost\";} "}
-varnish v1 -clierr 106 {vcl.inline a00å "vcl 4.0; backend b { .host = \"localhost\";} "}
-
-varnish v1 -vcl+backend {
-	sub vcl_recv {
-		return (synth(400));
-	}
-}
-
-varnish v1 -start
-
-client c1 {
-	txreq
-	rxresp
-	expect resp.status == 400
-} -run
-
-varnish v1 -cliok "vcl.use vcl1"
-
-client c1 {
-	txreq
-	rxresp
-	expect resp.status == 200
-} -run
-
-varnish v1 -cliok "vcl.list"
-varnish v1 -clierr 106 "vcl.label foo vcl0"
-varnish v1 -cliok "vcl.label foo vcl2"
-varnish v1 -cliok "vcl.label bar vcl2"
-varnish v1 -cliok "vcl.list"
-varnish v1 -clierr 300 "vcl.discard vcl2"
-varnish v1 -cliok "vcl.discard bar"
-varnish v1 -cliok "vcl.label foo vcl1"
-varnish v1 -clierr 106 "vcl.label vcl1 vcl2"
-varnish v1 -clierr 106 "vcl.state foo cold"
-varnish v1 -clierr 300 "vcl.label bar foo"
-varnish v1 -clierr 300 "vcl.discard vcl1"
-varnish v1 -cliok "vcl.list"
-varnish v1 -cliok "vcl.use foo"
-varnish v1 -clierr 300 "vcl.discard foo"
-varnish v1 -cliok "vcl.list"
-
-client c1 -run
-
-varnish v1 -cliok "vcl.label foo vcl2"
-
-client c1 {
-	txreq
-	rxresp
-	expect resp.status == 400
-} -run
-
-varnish v1 -cliok "vcl.use vcl1"
-varnish v1 -cliok "vcl.list"
-
-client c1 {
-	txreq
-	rxresp
-	expect resp.status == 200
-} -run
-
-varnish v1 -cliok "vcl.discard foo"
-varnish v1 -clierr 106 "vcl.discard foo"
-
-varnish v1 -stop
-varnish v1 -cliok "vcl.list"
-varnish v1 -clierr 106 "vcl.label fo- vcl0"
-varnish v1 -cliok "vcl.label fo- vcl1"
-varnish v1 -clierr 300 "vcl.label bar fo-"
-varnish v1 -clierr 200 "vcl.state vcl1 warm"
-varnish v1 -clierr 200 "vcl.state vcl1 auto"
-varnish v1 -clierr 300 "vcl.state vcl1 cold"
-varnish v1 -clierr 300 "vcl.discard vcl1"
-varnish v1 -cliok "vcl.list"
-varnish v1 -cliok "vcl.use fo-"
-varnish v1 -clierr 300 "vcl.discard fo-"
-varnish v1 -cliok "vcl.list"
-
-server s1 -start
-
-varnish v1 -start
-client c1 -run
-varnish v1 -stop
-varnish v1 -cliok "vcl.use vcl1"
-varnish v1 -cliok "vcl.discard fo-"
-varnish v1 -clierr 106 "vcl.discard fo-"
-
-varnish v1 -cliok "vcl.label label1 vcl1"
-varnish v1 -cliok "vcl.label label2 vcl1"
-varnish v1 -cliok "vcl.label label3 vcl1"
-varnish v1 -cliok "vcl.list"
-
-varnish v1 -start
-varnish v1 -cliok "vcl.list"
-varnish v1 -cliok "vcl.label snarf vcl1"
-server s1 -start
-client c1 -run
-
-# Test loop detection
-#######################################################################
-
-varnish v1 -cliok vcl.list
-
-varnish v1 -vcl+backend { }
-
-varnish v1 -cliok "vcl.label lblA vcl3"
-
-varnish v1 -vcl+backend { sub vcl_recv { return (vcl(lblA)); } }
-
-varnish v1 -cliok "vcl.label lblB vcl4"
-
-varnish v1 -vcl+backend { sub vcl_recv { return (vcl(lblB)); } }
-
-varnish v1 -clierr 106 "vcl.label lblA vcl5"
-varnish v1 -cliexpect \
-	{can only be used from the active VCL} \
-	{vcl.label lblA vcl5}
-