Ema has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/374973 )
Change subject: varnish: remove varnishtest-runner
......................................................................
varnish: remove varnishtest-runner
In order to support both Varnish 3 and Varnish 4, who differ here and
there in their interpretation of the HTTP RFCs, we introduced
varnishtest-runner to allow passing values to our VTC tests via macros.
Get rid of it as the migration to v4 is long finished.
Bug: T150660
Change-Id: I6c2437f500c3a1231a54be316a450ab4724200b9
---
M modules/varnish/files/tests/upload/05-range-requests.vtc
M modules/varnish/files/tests/upload/06-range-requests-convert-into-pass.vtc
M modules/varnish/manifests/common/vcl.pp
D modules/varnish/templates/varnishtest-runner.sh.erb
4 files changed, 5 insertions(+), 17 deletions(-)
Approvals:
Ema: Verified; Looks good to me, approved
diff --git a/modules/varnish/files/tests/upload/05-range-requests.vtc
b/modules/varnish/files/tests/upload/05-range-requests.vtc
index 2b4605c..53f3a9b 100644
--- a/modules/varnish/files/tests/upload/05-range-requests.vtc
+++ b/modules/varnish/files/tests/upload/05-range-requests.vtc
@@ -66,9 +66,8 @@
rxresp
# Varnish 4 returns a 416 - Range Not Satisfiable
# Varnish 3 responds with a 200 and the entire selected representation
- # Use macros for these values to cover both versions
- expect resp.status == ${unsatisfiable_status}
- expect resp.http.Content-Length == ${unsatisfiable_length}
+ expect resp.status == 416
+ expect resp.http.Content-Length == 0
}
# Range request for bytes > CL, varnish returns the whole cached object.
diff --git
a/modules/varnish/files/tests/upload/06-range-requests-convert-into-pass.vtc
b/modules/varnish/files/tests/upload/06-range-requests-convert-into-pass.vtc
index 85a601b..3e4ea8e 100644
--- a/modules/varnish/files/tests/upload/06-range-requests-convert-into-pass.vtc
+++ b/modules/varnish/files/tests/upload/06-range-requests-convert-into-pass.vtc
@@ -19,8 +19,8 @@
# Range request over a certain threshold
txreq -url "/test" -hdr "Host: upload.wikimedia.org" -hdr "Range:
bytes=999999999-"
rxresp
- expect resp.status == ${unsatisfiable_status}
- expect resp.http.Content-Length == ${unsatisfiable_length}
+ expect resp.status == 416
+ expect resp.http.Content-Length == 0
}
client c1 -run
diff --git a/modules/varnish/manifests/common/vcl.pp
b/modules/varnish/manifests/common/vcl.pp
index 2c76a67..8c08859 100644
--- a/modules/varnish/manifests/common/vcl.pp
+++ b/modules/varnish/manifests/common/vcl.pp
@@ -19,13 +19,7 @@
recurse => true,
}
- $unsatisfiable_status = 416
- $unsatisfiable_length = 0
-
file { '/usr/local/bin/varnishtest-runner':
- owner => 'root',
- group => 'root',
- mode => '0755',
- content => template("${module_name}/varnishtest-runner.sh.erb"),
+ ensure => absent,
}
}
diff --git a/modules/varnish/templates/varnishtest-runner.sh.erb
b/modules/varnish/templates/varnishtest-runner.sh.erb
deleted file mode 100644
index 85a381c..0000000
--- a/modules/varnish/templates/varnishtest-runner.sh.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-varnishtest -Dunsatisfiable_status=<%= @unsatisfiable_status %> \
- -Dunsatisfiable_length=<%= @unsatisfiable_length %> \
- $@
--
To view, visit https://gerrit.wikimedia.org/r/374973
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6c2437f500c3a1231a54be316a450ab4724200b9
Gerrit-PatchSet: 2
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
