Ema has submitted this change and it was merged.
Change subject: cache_upload varnishtest: pass Range requests
......................................................................
cache_upload varnishtest: pass Range requests
Since 8141ba0ab8029bd3da1da2992237860a5ac3bd46, cache_upload backends
pass Range requests. Update VTC test cases accordingly.
Bug: T142233
Bug: T131502
Change-Id: Ic9c3b7ed5098e98f8f9143f795d2fd243ae57b34
---
M modules/varnish/files/tests/upload/05-range-requests.vtc
1 file changed, 18 insertions(+), 17 deletions(-)
Approvals:
Ema: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/varnish/files/tests/upload/05-range-requests.vtc
b/modules/varnish/files/tests/upload/05-range-requests.vtc
index 2c48e0d..2b4605c 100644
--- a/modules/varnish/files/tests/upload/05-range-requests.vtc
+++ b/modules/varnish/files/tests/upload/05-range-requests.vtc
@@ -33,31 +33,32 @@
expect resp.http.Content-Length == 10
}
-# First range request 0-9, expecting a miss
+# First range request 0-9, expecting a pass
client c1 -run
-varnish v1 -expect cache_miss == 1
+varnish v1 -expect cache_miss == 0
varnish v1 -expect cache_hit == 0
-varnish v1 -expect n_object == 1
+varnish v1 -expect n_object == 0
+varnish v1 -expect s_pass == 1
-# Second range request 0-9, expecting a hit
+# Second range request 0-9, expecting another pass
client c1 -run
-varnish v1 -expect cache_miss == 1
-varnish v1 -expect cache_hit == 1
-varnish v1 -expect n_object == 1
+varnish v1 -expect cache_miss == 0
+varnish v1 -expect cache_hit == 0
+varnish v1 -expect n_object == 0
+varnish v1 -expect s_pass == 2
client c2 {
- # Range request for an object in cache
txreq -url "/test" -hdr "Host: upload.wikimedia.org" -hdr "Range:
bytes=1-4"
rxresp
expect resp.status == 206
expect resp.http.Content-Length == 4
}
-# Range request for bytes already fetched (1-4), expecting a hit
client c2 -run
-varnish v1 -expect cache_miss == 1
-varnish v1 -expect cache_hit == 2
-varnish v1 -expect n_object == 1
+varnish v1 -expect cache_miss == 0
+varnish v1 -expect cache_hit == 0
+varnish v1 -expect n_object == 0
+varnish v1 -expect s_pass == 3
client c3 {
# unsatisfiable Range request
@@ -70,9 +71,9 @@
expect resp.http.Content-Length == ${unsatisfiable_length}
}
-# Range request for bytes > CL, varnish returns the whole cached object. This
-# is a cache hit.
+# Range request for bytes > CL, varnish returns the whole cached object.
client c3 -run
-varnish v1 -expect cache_miss == 1
-varnish v1 -expect cache_hit == 3
-varnish v1 -expect n_object == 1
+varnish v1 -expect cache_miss == 0
+varnish v1 -expect cache_hit == 0
+varnish v1 -expect n_object == 0
+varnish v1 -expect s_pass == 4
--
To view, visit https://gerrit.wikimedia.org/r/306448
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic9c3b7ed5098e98f8f9143f795d2fd243ae57b34
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ema <[email protected]>
Gerrit-Reviewer: BBlack <[email protected]>
Gerrit-Reviewer: Ema <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
