[MediaWiki-commits] [Gerrit] operations/puppet[production]: cache_text varnishtest: proper caching of mangled requests

[Ema (Code Review)]

Ema has submitted this change and it was merged.

Change subject: cache_text varnishtest: proper caching of mangled requests
......................................................................


cache_text varnishtest: proper caching of mangled requests

Test proper caching of requests mangled in misspass_mangle
(direct-backends).

Also add -p vcc_allow_inline_c=true to 01-w.wiki-shortener.vtc for v4
compatibility.

Bug: T131503
Change-Id: Id1b2d3ee765b42eb2aaffd2598a48a8eb63bee75
---
M modules/varnish/files/tests/text/01-w.wiki-shortener.vtc
A modules/varnish/files/tests/text/07-backend-misspass_mangle-proper-caching.vtc
2 files changed, 41 insertions(+), 1 deletion(-)

Approvals:
  Ema: Looks good to me, approved
  BBlack: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/modules/varnish/files/tests/text/01-w.wiki-shortener.vtc 
b/modules/varnish/files/tests/text/01-w.wiki-shortener.vtc
index 28cad3d..aa38011 100644
--- a/modules/varnish/files/tests/text/01-w.wiki-shortener.vtc
+++ b/modules/varnish/files/tests/text/01-w.wiki-shortener.vtc
@@ -6,7 +6,7 @@
     txresp
 } -start
 
-varnish v1 -arg "-p vcc_err_unref=false" -vcl+backend {
+varnish v1 -arg "-p vcc_err_unref=false -p vcc_allow_inline_c=true" 
-vcl+backend {
     backend vtc_backend {
         .host = "${s1_addr}"; .port = "${s1_port}";
     }
diff --git 
a/modules/varnish/files/tests/text/07-backend-misspass_mangle-proper-caching.vtc
 
b/modules/varnish/files/tests/text/07-backend-misspass_mangle-proper-caching.vtc
new file mode 100644
index 0000000..3aef83f
--- /dev/null
+++ 
b/modules/varnish/files/tests/text/07-backend-misspass_mangle-proper-caching.vtc
@@ -0,0 +1,40 @@
+varnishtest "backend misspass_mangle proper caching"
+
+server s1 {
+    # First miss (/api/rest_v1/)
+    rxreq
+    # Expect proper URL rewriting by misspass_mangle
+    expect req.url == 
"/wikimedia.org/v1/media/math/render/svg/d494a1039a0708e25bfeb9abb059bbefdaf2bcc3"
+    txresp
+
+    # Second miss (X-Subdomain)
+    rxreq
+    expect req.http.Host == "test.org"
+    txresp
+} -start
+
+varnish v1 -arg "-p vcc_err_unref=false -p vcc_allow_inline_c=true" 
-vcl+backend {
+    backend vtc_backend {
+        .host = "${s1_addr}"; .port = "${s1_port}";
+    }
+
+    include "/usr/share/varnish/tests/wikimedia_text-backend.vcl";
+} -start
+
+client c1 {
+    txreq -url 
"/api/rest_v1/media/math/render/svg/d494a1039a0708e25bfeb9abb059bbefdaf2bcc3" 
-hdr "Host: wikimedia.org"
+    rxresp
+    expect resp.http.X-Cache-Int ~ "miss"
+
+    txreq -url 
"/api/rest_v1/media/math/render/svg/d494a1039a0708e25bfeb9abb059bbefdaf2bcc3" 
-hdr "Host: wikimedia.org"
+    rxresp
+    expect resp.http.X-Cache-Int ~ "hit"
+
+    txreq -hdr "X-Subdomain: example.org" -hdr "x-dt-host: test.org"
+    rxresp
+    expect resp.http.X-Cache-Int ~ "miss"
+
+    txreq -hdr "X-Subdomain: example.org" -hdr "x-dt-host: test.org"
+    rxresp
+    expect resp.http.X-Cache-Int ~ "hit"
+} -run

-- 
To view, visit https://gerrit.wikimedia.org/r/319829
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Id1b2d3ee765b42eb2aaffd2598a48a8eb63bee75
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ema <e...@wikimedia.org>
Gerrit-Reviewer: BBlack <bbl...@wikimedia.org>
Gerrit-Reviewer: Ema <e...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits