[4.1] bf0f54d Fix WS overflow test cases for i386.

Lasse Karstensen lkarsten at varnish-software.com
Tue Sep 8 12:06:42 CEST 2015


commit bf0f54d37a1f3f5004d81222560828e02308d537
Author: Lasse Karstensen <lkarsten at varnish-software.com>
Date:   Tue Sep 8 11:58:15 2015 +0200

    Fix WS overflow test cases for i386.
    
    Some of the WS sizes are adjusted on startup when running
    on i386/i686.
    
    Adjust the test cases to take that into account.

diff --git a/bin/varnishtest/tests/c00070.vtc b/bin/varnishtest/tests/c00070.vtc
index 27f339f..d389ce3 100644
--- a/bin/varnishtest/tests/c00070.vtc
+++ b/bin/varnishtest/tests/c00070.vtc
@@ -15,7 +15,6 @@ varnish v1 -vcl+backend {
 	}
 
 	sub vcl_deliver {
-		set resp.http.free_client = debug.workspace_free(client);
 		set resp.http.free_session = debug.workspace_free(session);
 		set resp.http.free_thread = debug.workspace_free(thread);
 
@@ -39,8 +38,7 @@ client c1 {
 	rxresp
 	expect resp.http.overflowed == "false"
 
-	expect resp.http.free_client > 57000
-	expect resp.http.free_backend > 57000
+	expect resp.http.free_backend > 9000
 	expect resp.http.free_session > 250
 	expect resp.http.free_thread > 2000
 } -run
@@ -52,4 +50,3 @@ client c2 {
 } -run
 
 logexpect l1 -wait
-
diff --git a/bin/varnishtest/tests/c00071.vtc b/bin/varnishtest/tests/c00071.vtc
index 59e3281..9cd4a1f 100644
--- a/bin/varnishtest/tests/c00071.vtc
+++ b/bin/varnishtest/tests/c00071.vtc
@@ -17,7 +17,7 @@ varnish v1 -vcl+backend {
 		debug.workspace_allocate(client, debug.workspace_free(client) - 200);
 
 		if (req.url ~ "/bar") {
-			set resp.http.x-foo = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
+			set resp.http.x-foo = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
 		}
 		else if (req.url ~ "/baz") {
 			set resp.http.x-foo = regsub(req.url, "baz", "baaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaz");



More information about the varnish-commit mailing list