[master] a0bae480d Adjust tests to *.xid type change

Nils Goroll nils.goroll at uplex.de
Wed Oct 26 22:04:15 UTC 2022


commit a0bae480da8755daf62ee825bfc084c84f1069f5
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Thu Oct 27 00:02:37 2022 +0200

    Adjust tests to *.xid type change

diff --git a/bin/varnishtest/tests/r02618.vtc b/bin/varnishtest/tests/r02618.vtc
index efe1a23c6..2b8dba60b 100644
--- a/bin/varnishtest/tests/r02618.vtc
+++ b/bin/varnishtest/tests/r02618.vtc
@@ -7,13 +7,11 @@ server s1 {
 
 varnish v1 -vcl+backend {
 	import vtc;
-	import std;
 	sub vcl_recv {
 		return (hash);
 	}
 	sub vcl_deliver {
-		vtc.workspace_alloc(client, -4 *
-			(std.integer(req.xid, 1001) - 1001) / 2);
+		vtc.workspace_alloc(client, -4 * (req.xid - 1001) / 2);
 	}
 } -start
 
diff --git a/bin/varnishtest/tests/r02645.vtc b/bin/varnishtest/tests/r02645.vtc
index d66573747..982c50a96 100644
--- a/bin/varnishtest/tests/r02645.vtc
+++ b/bin/varnishtest/tests/r02645.vtc
@@ -7,13 +7,11 @@ server s1 -repeat 100 {
 
 varnish v1 -vcl+backend {
 	import vtc;
-	import std;
 	sub vcl_recv {
 		return (pass);
 	}
 	sub vcl_backend_fetch {
-		vtc.workspace_alloc(backend, -4 *
-			(std.integer(bereq.xid, 1002) - 1000) / 2);
+		vtc.workspace_alloc(backend, -4 * (bereq.xid - 1000) / 2);
 	}
 } -start
 
diff --git a/bin/varnishtest/tests/r03253.vtc b/bin/varnishtest/tests/r03253.vtc
index af72560c5..7d8072aaa 100644
--- a/bin/varnishtest/tests/r03253.vtc
+++ b/bin/varnishtest/tests/r03253.vtc
@@ -7,13 +7,11 @@ server s1 -repeat 100 {
 
 varnish v1 -vcl+backend {
 	import vtc;
-	import std;
 	sub vcl_recv {
 		return (pass);
 	}
 	sub vcl_backend_response {
-		vtc.workspace_alloc(backend, -4 *
-			(std.integer(bereq.xid, 1002) - 1000) / 2);
+		vtc.workspace_alloc(backend, -4 * (bereq.xid - 1000) / 2);
 		set beresp.do_esi = true;
 	}
 } -start


More information about the varnish-commit mailing list