[master] f10b6de Get this testcase running with the correct suffix.

Poul-Henning Kamp phk at FreeBSD.org
Mon Mar 16 09:14:25 CET 2015


commit f10b6deca8852aecaf28ffbf7d11e76a39bba40f
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Mar 16 08:14:05 2015 +0000

    Get this testcase running with the correct suffix.

diff --git a/bin/varnishtest/tests/v00043.vcl b/bin/varnishtest/tests/v00043.vcl
deleted file mode 100644
index 6e38fe9..0000000
--- a/bin/varnishtest/tests/v00043.vcl
+++ /dev/null
@@ -1,56 +0,0 @@
-varnishtest "vcl.state coverage tests"
-
-server s1 -repeat 20 {
-	rxreq
-	txresp
-	delay .2
-	close
-} -start
-
-varnish v1 -vcl {
-	backend default {
-		.host = "${s1_addr}";
-		.probe = { .interval = 1s; .initial = 1;}
-	}
-} -start
-
-varnish v1 -cliok "param.set vcl_cooldown 3"
-
-# We only have one vcl yet
-varnish v1 -expect VBE.vcl1.default.happy > 0
-varnish v1 -expect !VBE.vcl2.default.happy
-varnish v1 -cliok "backend.list -p *.*"
-
-varnish v1 -vcl {
-	backend default {
-		.host = "${s1_addr}";
-		.probe = { .interval = 1s; .initial = 1;}
-	}
-}
-
-# Now we have two vcls (and run on the latest loaded)
-varnish v1 -expect VBE.vcl1.default.happy > 0
-varnish v1 -expect VBE.vcl2.default.happy > 0
-
-# Freeze the first VCL
-varnish v1 -cliok "vcl.state vcl1 cold"
-varnish v1 -expect !VBE.vcl1.default.happy
-
-# Set it auto should be a no-op
-varnish v1 -cliok "vcl.state vcl1 auto"
-varnish v1 -expect !VBE.vcl1.default.happy
-
-# Use it, and it should come alive
-varnish v1 -cliok "vcl.use vcl1"
-varnish v1 -expect VBE.vcl1.default.happy > 0
-varnish v1 -expect VBE.vcl2.default.happy > 0
-
-# and the unused one should go cold
-delay 4
-varnish v1 -expect !VBE.vcl2.default.happy 
-
-# Mark the used warm and use it the other
-varnish v1 -cliok "vcl.state vcl1 warm"
-varnish v1 -cliok "vcl.use vcl2"
-delay 4
-varnish v1 -expect VBE.vcl2.default.happy > 0
diff --git a/bin/varnishtest/tests/v00044.vtc b/bin/varnishtest/tests/v00044.vtc
new file mode 100644
index 0000000..7907e7e
--- /dev/null
+++ b/bin/varnishtest/tests/v00044.vtc
@@ -0,0 +1,57 @@
+varnishtest "vcl.state coverage tests"
+
+server s1 -repeat 20 {
+	rxreq
+	txresp
+	delay .2
+	close
+} -start
+
+varnish v1 -vcl {
+	backend default {
+		.host = "${s1_addr}";
+		.probe = { .interval = 1s; .initial = 1;}
+	}
+} -start
+
+varnish v1 -cliok "param.set vcl_cooldown 3"
+
+# We only have one vcl yet
+varnish v1 -expect VBE.vcl1.default.happy > 0
+varnish v1 -expect !VBE.vcl2.default.happy
+varnish v1 -cliok "backend.list -p *.*"
+
+varnish v1 -vcl {
+	backend default {
+		.host = "${s1_addr}";
+		.probe = { .interval = 1s; .initial = 1;}
+	}
+}
+
+# Now we have two vcls (and run on the latest loaded)
+varnish v1 -expect VBE.vcl1.default.happy > 0
+varnish v1 -expect VBE.vcl2.default.happy > 0
+
+# Freeze the first VCL
+varnish v1 -cliok "vcl.state vcl1 cold"
+varnish v1 -expect !VBE.vcl1.default.happy
+
+# Set it auto should be a no-op
+varnish v1 -cliok "vcl.state vcl1 auto"
+varnish v1 -expect !VBE.vcl1.default.happy
+
+# Use it, and it should come alive
+varnish v1 -cliok "vcl.use vcl1"
+delay .4
+varnish v1 -expect VBE.vcl1.default.happy >= 0
+varnish v1 -expect VBE.vcl2.default.happy > 0
+
+# and the unused one should go cold
+delay 4
+varnish v1 -expect !VBE.vcl2.default.happy 
+
+# Mark the used warm and use it the other
+varnish v1 -cliok "vcl.state vcl1 warm"
+varnish v1 -cliok "vcl.use vcl2"
+delay 4
+varnish v1 -expect VBE.vcl2.default.happy >= 0



More information about the varnish-commit mailing list