[master] e8d8f58 Move this very slow test earlier in the sequence.

Poul-Henning Kamp phk at FreeBSD.org
Thu Dec 14 12:32:04 UTC 2017


commit e8d8f5886adeb5ae2203b878c19174183da17a68
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Thu Dec 14 12:31:08 2017 +0000

    Move this very slow test earlier in the sequence.

diff --git a/bin/varnishtest/tests/v00003.vtc b/bin/varnishtest/tests/v00003.vtc
new file mode 100644
index 0000000..ff218f2
--- /dev/null
+++ b/bin/varnishtest/tests/v00003.vtc
@@ -0,0 +1,94 @@
+varnishtest "vcl.state coverage tests"
+
+server s1 -repeat 20 {
+	rxreq
+	txresp
+	delay .2
+	close
+} -start
+
+# The debug vmod logs temperature vcl events
+varnish v1 -arg "-p vcl_cooldown=1" -vcl {
+	import debug;
+	backend default {
+		.host = "${s1_addr}";
+		.probe = { .interval = 1s; .initial = 1;}
+	}
+} -start
+
+# 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)
+delay .4
+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"
+delay .4
+varnish v1 -expect !VBE.vcl1.default.happy
+
+# Set it auto should be a no-op
+varnish v1 -cliok "vcl.state vcl1 auto"
+delay .4
+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 the other
+varnish v1 -cliok "vcl.state vcl1 warm"
+varnish v1 -cliok "vcl.use vcl2"
+
+# It will stay warm even after the cooldown period
+delay 4
+varnish v1 -expect VBE.vcl1.default.happy >= 0
+varnish v1 -expect VBE.vcl2.default.happy >= 0
+
+# You can't freeze the active VCL
+varnish v1 -clierr 300 "vcl.state vcl2 cold"
+
+# However a warm event is guaranteed...
+logexpect l1 -v v1 -g raw {
+	expect * 0 Debug "vcl1: VCL_EVENT_COLD"
+	expect * 0 Debug "vcl1: VCL_EVENT_WARM"
+} -start
+
+# ...when you use a cold VCL
+varnish v1 -cliok "vcl.state vcl1 cold"
+varnish v1 -cliok "vcl.use vcl1"
+
+logexpect l1 -wait
+
+# It will apply the cooldown period once inactive
+varnish v1 -cliok "vcl.use vcl2"
+delay .4
+varnish v1 -expect VBE.vcl1.default.happy >= 0
+delay 4
+varnish v1 -expect !VBE.vcl1.default.happy
+
+# A VMOD's warm-up can fail
+varnish v1 -cliok "param.set max_esi_depth 42"
+varnish v1 -clierr 300 "vcl.state vcl1 warm"
+
+# A warm-up failure can also fail a child start
+varnish v1 -cliok stop
+varnish v1 -cliok "vcl.state vcl1 warm"
+varnish v1 -clierr 300 start
diff --git a/bin/varnishtest/tests/v00044.vtc b/bin/varnishtest/tests/v00044.vtc
deleted file mode 100644
index ff218f2..0000000
--- a/bin/varnishtest/tests/v00044.vtc
+++ /dev/null
@@ -1,94 +0,0 @@
-varnishtest "vcl.state coverage tests"
-
-server s1 -repeat 20 {
-	rxreq
-	txresp
-	delay .2
-	close
-} -start
-
-# The debug vmod logs temperature vcl events
-varnish v1 -arg "-p vcl_cooldown=1" -vcl {
-	import debug;
-	backend default {
-		.host = "${s1_addr}";
-		.probe = { .interval = 1s; .initial = 1;}
-	}
-} -start
-
-# 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)
-delay .4
-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"
-delay .4
-varnish v1 -expect !VBE.vcl1.default.happy
-
-# Set it auto should be a no-op
-varnish v1 -cliok "vcl.state vcl1 auto"
-delay .4
-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 the other
-varnish v1 -cliok "vcl.state vcl1 warm"
-varnish v1 -cliok "vcl.use vcl2"
-
-# It will stay warm even after the cooldown period
-delay 4
-varnish v1 -expect VBE.vcl1.default.happy >= 0
-varnish v1 -expect VBE.vcl2.default.happy >= 0
-
-# You can't freeze the active VCL
-varnish v1 -clierr 300 "vcl.state vcl2 cold"
-
-# However a warm event is guaranteed...
-logexpect l1 -v v1 -g raw {
-	expect * 0 Debug "vcl1: VCL_EVENT_COLD"
-	expect * 0 Debug "vcl1: VCL_EVENT_WARM"
-} -start
-
-# ...when you use a cold VCL
-varnish v1 -cliok "vcl.state vcl1 cold"
-varnish v1 -cliok "vcl.use vcl1"
-
-logexpect l1 -wait
-
-# It will apply the cooldown period once inactive
-varnish v1 -cliok "vcl.use vcl2"
-delay .4
-varnish v1 -expect VBE.vcl1.default.happy >= 0
-delay 4
-varnish v1 -expect !VBE.vcl1.default.happy
-
-# A VMOD's warm-up can fail
-varnish v1 -cliok "param.set max_esi_depth 42"
-varnish v1 -clierr 300 "vcl.state vcl1 warm"
-
-# A warm-up failure can also fail a child start
-varnish v1 -cliok stop
-varnish v1 -cliok "vcl.state vcl1 warm"
-varnish v1 -clierr 300 start


More information about the varnish-commit mailing list