r4651 - trunk/varnish-cache/bin/varnishtest/tests

phk at varnish-cache.org phk at varnish-cache.org
Thu Apr 8 18:21:16 CEST 2010


Author: phk
Date: 2010-04-08 18:21:16 +0200 (Thu, 08 Apr 2010)
New Revision: 4651

Modified:
   trunk/varnish-cache/bin/varnishtest/tests/b00019.vtc
   trunk/varnish-cache/bin/varnishtest/tests/c00009.vtc
   trunk/varnish-cache/bin/varnishtest/tests/c00024.vtc
   trunk/varnish-cache/bin/varnishtest/tests/c00028.vtc
   trunk/varnish-cache/bin/varnishtest/tests/c00029.vtc
   trunk/varnish-cache/bin/varnishtest/tests/c00030.vtc
   trunk/varnish-cache/bin/varnishtest/tests/r00365.vtc
   trunk/varnish-cache/bin/varnishtest/tests/r00412.vtc
   trunk/varnish-cache/bin/varnishtest/tests/s00003.vtc
   trunk/varnish-cache/bin/varnishtest/tests/v00023.vtc
Log:
change "restart;" to "return(restart);"



Modified: trunk/varnish-cache/bin/varnishtest/tests/b00019.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/b00019.vtc	2010-04-08 16:19:22 UTC (rev 4650)
+++ trunk/varnish-cache/bin/varnishtest/tests/b00019.vtc	2010-04-08 16:21:16 UTC (rev 4651)
@@ -19,7 +19,7 @@
 
 varnish v1 -vcl+backend {
 	sub vcl_fetch {
-	       restart;
+	       return (restart);
 	}
 
 	sub vcl_error {

Modified: trunk/varnish-cache/bin/varnishtest/tests/c00009.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/c00009.vtc	2010-04-08 16:19:22 UTC (rev 4650)
+++ trunk/varnish-cache/bin/varnishtest/tests/c00009.vtc	2010-04-08 16:21:16 UTC (rev 4651)
@@ -25,7 +25,7 @@
 
 	sub vcl_fetch {
 		if (beresp.status != 200) {
-			restart;
+			return (restart);
 		}
 	}
 } -start

Modified: trunk/varnish-cache/bin/varnishtest/tests/c00024.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/c00024.vtc	2010-04-08 16:19:22 UTC (rev 4650)
+++ trunk/varnish-cache/bin/varnishtest/tests/c00024.vtc	2010-04-08 16:21:16 UTC (rev 4651)
@@ -26,7 +26,7 @@
 	}
 	sub vcl_error { 
 		if (req.restarts < 1) { 
-			restart; 
+			return (restart); 
 		} else { 
 			set obj.status = 201; 
 		}

Modified: trunk/varnish-cache/bin/varnishtest/tests/c00028.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/c00028.vtc	2010-04-08 16:19:22 UTC (rev 4650)
+++ trunk/varnish-cache/bin/varnishtest/tests/c00028.vtc	2010-04-08 16:21:16 UTC (rev 4651)
@@ -11,7 +11,7 @@
 	    set req.backend = bad;
 	}
 	sub vcl_error { 
-	    restart; 
+	    return (restart);
 	}
  } -start 
 

Modified: trunk/varnish-cache/bin/varnishtest/tests/c00029.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/c00029.vtc	2010-04-08 16:19:22 UTC (rev 4650)
+++ trunk/varnish-cache/bin/varnishtest/tests/c00029.vtc	2010-04-08 16:21:16 UTC (rev 4651)
@@ -36,7 +36,7 @@
 	sub vcl_fetch {
 		if (beresp.http.X-Saint == "yes") {
 			set beresp.saintmode = 20s;
-			restart;
+			return(restart);
 		}
 		set beresp.grace = 1h;
 		set beresp.ttl = 1s;

Modified: trunk/varnish-cache/bin/varnishtest/tests/c00030.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/c00030.vtc	2010-04-08 16:19:22 UTC (rev 4650)
+++ trunk/varnish-cache/bin/varnishtest/tests/c00030.vtc	2010-04-08 16:21:16 UTC (rev 4651)
@@ -43,7 +43,7 @@
 	sub vcl_fetch {
 		if (beresp.http.X-Saint == "yes") {
 			set beresp.saintmode = 20s;
-			restart;
+			return (restart);
 		}
 		set beresp.grace = 1h;
 		set beresp.ttl = 1s;

Modified: trunk/varnish-cache/bin/varnishtest/tests/r00365.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/r00365.vtc	2010-04-08 16:19:22 UTC (rev 4650)
+++ trunk/varnish-cache/bin/varnishtest/tests/r00365.vtc	2010-04-08 16:21:16 UTC (rev 4651)
@@ -14,7 +14,7 @@
 varnish v1 -vcl+backend { 
 	sub vcl_hit {
 		set obj.cacheable = false;
-		restart;
+		return (restart);
 	}
 } -start
 

Modified: trunk/varnish-cache/bin/varnishtest/tests/r00412.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/r00412.vtc	2010-04-08 16:19:22 UTC (rev 4650)
+++ trunk/varnish-cache/bin/varnishtest/tests/r00412.vtc	2010-04-08 16:21:16 UTC (rev 4651)
@@ -18,13 +18,13 @@
 			set beresp.ttl = 60 s;
 			set beresp.http.X-Magic-Redirect = "1";
 			set req.url = beresp.http.Location;
-			restart;
+			return (restart);
 		}
 	}
 	sub vcl_hit {
 		if (obj.http.X-Magic-Redirect == "1") {
 			set req.url = obj.http.Location;
-			restart;
+			return (restart);
 		}
 	}
 } -start

Modified: trunk/varnish-cache/bin/varnishtest/tests/s00003.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/s00003.vtc	2010-04-08 16:19:22 UTC (rev 4650)
+++ trunk/varnish-cache/bin/varnishtest/tests/s00003.vtc	2010-04-08 16:21:16 UTC (rev 4651)
@@ -24,7 +24,7 @@
 		if (beresp.http.foo == "2")
 		{
 			set beresp.saintmode = 2s;
-			restart;
+			return (restart);
 		}
 		return(deliver);
 	}

Modified: trunk/varnish-cache/bin/varnishtest/tests/v00023.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/v00023.vtc	2010-04-08 16:19:22 UTC (rev 4650)
+++ trunk/varnish-cache/bin/varnishtest/tests/v00023.vtc	2010-04-08 16:21:16 UTC (rev 4651)
@@ -14,7 +14,7 @@
 varnish v1 -vcl+backend { 
 	sub vcl_hit {
 		set obj.ttl = 0s;
-		restart;
+		return (restart);
 	}
 } -start
 




More information about the varnish-commit mailing list