r3741 - branches/2.0/varnish-cache/bin/varnishtest/tests

[tfheen at projects.linpro.no]

Author: tfheen
Date: 2009-02-11 08:49:21 +0100 (Wed, 11 Feb 2009)
New Revision: 3741

Modified:
   branches/2.0/varnish-cache/bin/varnishtest/tests/e00001.vtc
   branches/2.0/varnish-cache/bin/varnishtest/tests/e00002.vtc
   branches/2.0/varnish-cache/bin/varnishtest/tests/e00003.vtc
   branches/2.0/varnish-cache/bin/varnishtest/tests/e00004.vtc
   branches/2.0/varnish-cache/bin/varnishtest/tests/e00005.vtc
   branches/2.0/varnish-cache/bin/varnishtest/tests/e00006.vtc
   branches/2.0/varnish-cache/bin/varnishtest/tests/e00008.vtc
   branches/2.0/varnish-cache/bin/varnishtest/tests/e00009.vtc
   branches/2.0/varnish-cache/bin/varnishtest/tests/e00014.vtc
Log:
Merge r3572: Add bodylen expects to the ESI test cases



Modified: branches/2.0/varnish-cache/bin/varnishtest/tests/e00001.vtc
===================================================================
--- branches/2.0/varnish-cache/bin/varnishtest/tests/e00001.vtc	2009-02-11 07:46:11 UTC (rev 3740)
+++ branches/2.0/varnish-cache/bin/varnishtest/tests/e00001.vtc	2009-02-11 07:49:21 UTC (rev 3741)
@@ -17,12 +17,13 @@
 	sub vcl_fetch {
 		esi;
 	}
-} -start
+} -start -cliok "param.set esi_syntax 4"
 
 client c1 {
 	txreq 
 	rxresp
 	expect resp.status == 200
+	expect resp.bodylen == 35
 }
 
 client c1 -run

Modified: branches/2.0/varnish-cache/bin/varnishtest/tests/e00002.vtc
===================================================================
--- branches/2.0/varnish-cache/bin/varnishtest/tests/e00002.vtc	2009-02-11 07:46:11 UTC (rev 3740)
+++ branches/2.0/varnish-cache/bin/varnishtest/tests/e00002.vtc	2009-02-11 07:49:21 UTC (rev 3741)
@@ -24,6 +24,7 @@
 	txreq 
 	rxresp
 	expect resp.status == 200
+	expect resp.bodylen == 35
 }
 
 client c1 -run

Modified: branches/2.0/varnish-cache/bin/varnishtest/tests/e00003.vtc
===================================================================
--- branches/2.0/varnish-cache/bin/varnishtest/tests/e00003.vtc	2009-02-11 07:46:11 UTC (rev 3740)
+++ branches/2.0/varnish-cache/bin/varnishtest/tests/e00003.vtc	2009-02-11 07:49:21 UTC (rev 3741)
@@ -27,6 +27,7 @@
 client c1 {
 	txreq 
 	rxresp
+	expect resp.bodylen == 65
 	expect resp.status == 200
 }
 

Modified: branches/2.0/varnish-cache/bin/varnishtest/tests/e00004.vtc
===================================================================
--- branches/2.0/varnish-cache/bin/varnishtest/tests/e00004.vtc	2009-02-11 07:46:11 UTC (rev 3740)
+++ branches/2.0/varnish-cache/bin/varnishtest/tests/e00004.vtc	2009-02-11 07:49:21 UTC (rev 3741)
@@ -28,6 +28,7 @@
 	txreq 
 	rxresp
 	expect resp.status == 200
+	expect resp.bodylen == 67
 }
 
 client c1 -run

Modified: branches/2.0/varnish-cache/bin/varnishtest/tests/e00005.vtc
===================================================================
--- branches/2.0/varnish-cache/bin/varnishtest/tests/e00005.vtc	2009-02-11 07:46:11 UTC (rev 3740)
+++ branches/2.0/varnish-cache/bin/varnishtest/tests/e00005.vtc	2009-02-11 07:49:21 UTC (rev 3741)
@@ -29,6 +29,7 @@
 	txreq -url /foo/bar
 	rxresp
 	expect resp.status == 200
+	expect resp.bodylen == 67
 }
 
 client c1 -run

Modified: branches/2.0/varnish-cache/bin/varnishtest/tests/e00006.vtc
===================================================================
--- branches/2.0/varnish-cache/bin/varnishtest/tests/e00006.vtc	2009-02-11 07:46:11 UTC (rev 3740)
+++ branches/2.0/varnish-cache/bin/varnishtest/tests/e00006.vtc	2009-02-11 07:49:21 UTC (rev 3741)
@@ -40,6 +40,7 @@
 	txreq -url /foo/bar -hdr "Host: froboz"
 	rxresp
 	expect resp.status == 200
+	expect resp.bodylen == 67
 }
 
 client c1 -run

Modified: branches/2.0/varnish-cache/bin/varnishtest/tests/e00008.vtc
===================================================================
--- branches/2.0/varnish-cache/bin/varnishtest/tests/e00008.vtc	2009-02-11 07:46:11 UTC (rev 3740)
+++ branches/2.0/varnish-cache/bin/varnishtest/tests/e00008.vtc	2009-02-11 07:49:21 UTC (rev 3741)
@@ -68,6 +68,7 @@
 	txreq 
 	rxresp
 	expect resp.status == 200
+	expect resp.bodylen == 231
 }
 
 client c1 -run

Modified: branches/2.0/varnish-cache/bin/varnishtest/tests/e00009.vtc
===================================================================
--- branches/2.0/varnish-cache/bin/varnishtest/tests/e00009.vtc	2009-02-11 07:46:11 UTC (rev 3740)
+++ branches/2.0/varnish-cache/bin/varnishtest/tests/e00009.vtc	2009-02-11 07:49:21 UTC (rev 3741)
@@ -31,6 +31,7 @@
 	txreq 
 	rxresp
 	expect resp.status == 200
+	expect resp.bodylen == 72
 	expect resp.http.content-length == 72
 } -run
 
@@ -40,5 +41,6 @@
 	txreq -url bar
 	rxresp
 	expect resp.status == 200
+	expect resp.bodylen == 37
 	expect resp.http.transfer-encoding == "chunked"
 } -run

Modified: branches/2.0/varnish-cache/bin/varnishtest/tests/e00014.vtc
===================================================================
--- branches/2.0/varnish-cache/bin/varnishtest/tests/e00014.vtc	2009-02-11 07:46:11 UTC (rev 3740)
+++ branches/2.0/varnish-cache/bin/varnishtest/tests/e00014.vtc	2009-02-11 07:49:21 UTC (rev 3741)
@@ -20,6 +20,7 @@
 client c1 {
         txreq -url /foo
         rxresp
+	expect resp.bodylen == 49
 } -run
 
 varnish v1 -expect esi_parse == 0