[prev in list] [next in list] [prev in thread] [next in thread] 

List:       varnish-commit
Subject:    [master] 0fc5c76b4 Move this around to avoid mistakes
From:       Federico G. Schwindt <fgsch () lodoss ! net>
Date:       2019-03-14 23:50:09
Message-ID: 20190314235009.A6592A20EC () lists ! varnish-cache ! org
[Download RAW message or body]


commit 0fc5c76b487cd22e00d8e9ae953e4eb3eee2af47
Author: Federico G. Schwindt <fgsch@lodoss.net>
Date:   Thu Mar 14 23:37:27 2019 +0000

    Move this around to avoid mistakes

diff --git a/bin/varnishtest/tests/p00000.vtc b/bin/varnishtest/tests/p00000.vtc
index e3d23029e..05c308215 100644
--- a/bin/varnishtest/tests/p00000.vtc
+++ b/bin/varnishtest/tests/p00000.vtc
@@ -2,6 +2,10 @@ varnishtest "Test Basic persistence"
 
 feature persistent_storage
 
+shell -err -expect {-spersistent has been deprecated} {
+	varnishd -spersistent -f ''
+}
+
 server s1 {
 	rxreq
 	txresp
diff --git a/bin/varnishtest/tests/u00000.vtc b/bin/varnishtest/tests/u00000.vtc
index 5eba11b19..46bc0c013 100644
--- a/bin/varnishtest/tests/u00000.vtc
+++ b/bin/varnishtest/tests/u00000.vtc
@@ -46,14 +46,6 @@ shell -err -expect {-d makes no sense with -C} "varnishd -C -b 127.0.0.1:80 -d "
 shell -err -expect {-F makes no sense with -C} "varnishd -C -b 127.0.0.1:80 -F "
 shell -err -expect {Neither -b nor -f given} { varnishd -n ${tmpdir}/v0  }
 
-# This check is kept last because it may be skipped
-
-feature persistent_storage
-
-shell -err -expect {-spersistent has been deprecated} {
-	varnishd -spersistent -f ''
-}
-
 # Test -I and -l arguments (former a00016)
 
 shell -err -expect {Only one -I allowed} {
@@ -160,3 +152,5 @@ shell -err -expect {Cannot read -f file} {
 	exec varnishd -n ${tmpdir}/v0 -F -a :0 -l2m,3m -f ${tmpdir}/ok1 \
 	    -f ${tmpdir}/bad -f ${tmpdir}/ok2
 }
+
+# varnishd -spersistent is tested in p00000.vtc
_______________________________________________
varnish-commit mailing list
varnish-commit@varnish-cache.org
https://www.varnish-cache.org/lists/mailman/listinfo/varnish-commit
[prev in list] [next in list] [prev in thread] [next in thread]