Ema has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/393195 )
Change subject: cache_misc: use grafana.w.o instead of git.w.o in VTC tests
......................................................................
cache_misc: use grafana.w.o instead of git.w.o in VTC tests
To reduce the number of different Host header values in VTC, replace
git.w.o with grafana.w.o.
Change-Id: I7839310dee12135c9c21aaeebdd24407667316eb
---
M modules/varnish/files/tests/misc/01-basic-caching.vtc
M modules/varnish/files/tests/misc/09-chunked-response-add-cl.vtc
M modules/varnish/files/tests/misc/10-deliver-synth-x-client-ip.vtc
3 files changed, 6 insertions(+), 6 deletions(-)
Approvals:
Ema: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/varnish/files/tests/misc/01-basic-caching.vtc
b/modules/varnish/files/tests/misc/01-basic-caching.vtc
index eae1ec4..936e855 100644
--- a/modules/varnish/files/tests/misc/01-basic-caching.vtc
+++ b/modules/varnish/files/tests/misc/01-basic-caching.vtc
@@ -26,7 +26,7 @@
}
client c3 {
- txreq -hdr "Host: git.wikimedia.org"
+ txreq -hdr "Host: grafana.wikimedia.org"
rxresp
expect resp.status == 200
}
@@ -49,13 +49,13 @@
varnish v1 -expect cache_hit == 0
varnish v1 -expect n_object == 0
-# Cache miss with Host: git.wikimedia.org
+# Cache miss with Host: grafana.wikimedia.org
client c3 -run
varnish v1 -expect cache_miss == 1
varnish v1 -expect cache_hit == 0
varnish v1 -expect n_object == 1
-# Cache hit with Host: git.wikimedia.org
+# Cache hit with Host: grafana.wikimedia.org
client c3 -run
varnish v1 -expect cache_miss == 1
varnish v1 -expect cache_hit == 1
diff --git a/modules/varnish/files/tests/misc/09-chunked-response-add-cl.vtc
b/modules/varnish/files/tests/misc/09-chunked-response-add-cl.vtc
index bb3cca8..967d590 100644
--- a/modules/varnish/files/tests/misc/09-chunked-response-add-cl.vtc
+++ b/modules/varnish/files/tests/misc/09-chunked-response-add-cl.vtc
@@ -17,7 +17,7 @@
} -start
client c1 {
- txreq -hdr "Host: git.wikimedia.org" -hdr "X-Forwarded-Proto: https"
+ txreq -hdr "Host: grafana.wikimedia.org" -hdr "X-Forwarded-Proto: https"
rxresp
expect resp.status == 200
# We expect Content-Length to be set to 5 (hello) by varnish
diff --git a/modules/varnish/files/tests/misc/10-deliver-synth-x-client-ip.vtc
b/modules/varnish/files/tests/misc/10-deliver-synth-x-client-ip.vtc
index 42ed3c2..5364738 100644
--- a/modules/varnish/files/tests/misc/10-deliver-synth-x-client-ip.vtc
+++ b/modules/varnish/files/tests/misc/10-deliver-synth-x-client-ip.vtc
@@ -16,12 +16,12 @@
} -start
client c1 {
- txreq -hdr "Host: git.wikimedia.org" -hdr "X-Forwarded-Proto: https"
+ txreq -hdr "Host: grafana.wikimedia.org" -hdr "X-Forwarded-Proto: https"
rxresp
expect resp.status == 200
expect resp.http.X-Client-IP == "127.0.0.1"
- txreq -hdr "Host: git.wikimedia.org"
+ txreq -hdr "Host: grafana.wikimedia.org"
rxresp
# http -> https redirect through _synth, we should still get X-Client-IP
expect resp.status == 301
--
To view, visit https://gerrit.wikimedia.org/r/393195
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7839310dee12135c9c21aaeebdd24407667316eb
Gerrit-PatchSet: 1
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
