You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by bc...@apache.org on 2018/05/02 15:57:10 UTC
[trafficserver] branch master updated: Convert 'gzip' Au test case
to 'compress'.
This is an automated email from the ASF dual-hosted git repository.
bcall pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/master by this push:
new 53b7194 Convert 'gzip' Au test case to 'compress'.
53b7194 is described below
commit 53b719450525e2b4ae619b465c4a0798ce31f311
Author: Walt Karas <wk...@yahoo-inc.com>
AuthorDate: Tue May 1 19:13:04 2018 +0000
Convert 'gzip' Au test case to 'compress'.
---
.../{gzip/gzip.config => compress/compress.config} | 0
.../{gzip/gzip.gold => compress/compress.gold} | 194 +++++++++++++--------
.../gzip.test.py => compress/compress.test.py} | 62 ++++---
.../gzip2.config => compress/compress2.config} | 0
.../compress_observer.py} | 6 +-
.../pluginTest/{gzip => compress}/greplog.sh | 2 +-
tests/gold_tests/pluginTest/gzip/gzip_userver.gold | 19 --
7 files changed, 161 insertions(+), 122 deletions(-)
diff --git a/tests/gold_tests/pluginTest/gzip/gzip.config b/tests/gold_tests/pluginTest/compress/compress.config
similarity index 100%
rename from tests/gold_tests/pluginTest/gzip/gzip.config
rename to tests/gold_tests/pluginTest/compress/compress.config
diff --git a/tests/gold_tests/pluginTest/gzip/gzip.gold b/tests/gold_tests/pluginTest/compress/compress.gold
similarity index 70%
rename from tests/gold_tests/pluginTest/gzip/gzip.gold
rename to tests/gold_tests/pluginTest/compress/compress.gold
index 8bd76e3..d2d3061 100644
--- a/tests/gold_tests/pluginTest/gzip/gzip.gold
+++ b/tests/gold_tests/pluginTest/compress/compress.gold
@@ -1,296 +1,346 @@
> GET http://ae-0/obj0 HTTP/1.1
-> X-Ats-Gzip-Test: ts/0/gzip, deflate, sdch, br
+> X-Ats-Compress-Test: ts/0/gzip, deflate, sdch, br
> Accept-Encoding: gzip, deflate, sdch, br
< HTTP/1.1 200 OK
< Content-Type: text/javascript
< Content-Encoding: br
< Vary: Accept-Encoding
-< Content-Length: 41
+< Content-Length: 46
+
> GET http://ae-0/obj0 HTTP/1.1
-> X-Ats-Gzip-Test: ts/0/gzip
+> X-Ats-Compress-Test: ts/0/gzip
> Accept-Encoding: gzip
< HTTP/1.1 200 OK
< Content-Type: text/javascript
< Content-Encoding: gzip
< Vary: Accept-Encoding
-< Content-Length: 60
+< Content-Length: 71
+
> GET http://ae-0/obj0 HTTP/1.1
-> X-Ats-Gzip-Test: ts/0/br
+> X-Ats-Compress-Test: ts/0/br
> Accept-Encoding: br
< HTTP/1.1 200 OK
< Content-Type: text/javascript
< Content-Encoding: br
< Vary: Accept-Encoding
-< Content-Length: 41
+< Content-Length: 46
+
> GET http://ae-0/obj0 HTTP/1.1
-> X-Ats-Gzip-Test: ts/0/deflate
+> X-Ats-Compress-Test: ts/0/deflate
> Accept-Encoding: deflate
< HTTP/1.1 200 OK
< Content-Type: text/javascript
-< Content-Length: 41
+< Content-Length: 1050
+
+
> GET http://ae-1/obj1 HTTP/1.1
-> X-Ats-Gzip-Test: ts/1/gzip, deflate, sdch, br
+> X-Ats-Compress-Test: ts/1/gzip, deflate, sdch, br
> Accept-Encoding: gzip, deflate, sdch, br
< HTTP/1.1 200 OK
< Content-Type: text/javascript
< Content-Encoding: gzip
< Vary: Accept-Encoding
-< Content-Length: 60
+< Content-Length: 71
+
> GET http://ae-1/obj1 HTTP/1.1
-> X-Ats-Gzip-Test: ts/1/gzip
+> X-Ats-Compress-Test: ts/1/gzip
> Accept-Encoding: gzip
< HTTP/1.1 200 OK
< Content-Type: text/javascript
< Content-Encoding: gzip
< Vary: Accept-Encoding
-< Content-Length: 60
+< Content-Length: 71
+
> GET http://ae-1/obj1 HTTP/1.1
-> X-Ats-Gzip-Test: ts/1/br
+> X-Ats-Compress-Test: ts/1/br
> Accept-Encoding: br
< HTTP/1.1 200 OK
< Content-Type: text/javascript
-< Content-Length: 41
+< Content-Length: 1050
+
+
> GET http://ae-1/obj1 HTTP/1.1
-> X-Ats-Gzip-Test: ts/1/deflate
+> X-Ats-Compress-Test: ts/1/deflate
> Accept-Encoding: deflate
< HTTP/1.1 200 OK
< Content-Type: text/javascript
-< Content-Length: 41
+< Content-Length: 1050
+
+
> GET http://ae-2/obj2 HTTP/1.1
-> X-Ats-Gzip-Test: ts/2/gzip, deflate, sdch, br
+> X-Ats-Compress-Test: ts/2/gzip, deflate, sdch, br
> Accept-Encoding: gzip, deflate, sdch, br
< HTTP/1.1 200 OK
< Content-Type: text/javascript
< Content-Encoding: br
< Vary: Accept-Encoding
-< Content-Length: 41
+< Content-Length: 46
+
> GET http://ae-2/obj2 HTTP/1.1
-> X-Ats-Gzip-Test: ts/2/gzip
+> X-Ats-Compress-Test: ts/2/gzip
> Accept-Encoding: gzip
< HTTP/1.1 200 OK
< Content-Type: text/javascript
< Content-Encoding: gzip
< Vary: Accept-Encoding
-< Content-Length: 60
+< Content-Length: 71
+
> GET http://ae-2/obj2 HTTP/1.1
-> X-Ats-Gzip-Test: ts/2/br
+> X-Ats-Compress-Test: ts/2/br
> Accept-Encoding: br
< HTTP/1.1 200 OK
< Content-Type: text/javascript
< Content-Encoding: br
< Vary: Accept-Encoding
-< Content-Length: 41
+< Content-Length: 46
+
> GET http://ae-2/obj2 HTTP/1.1
-> X-Ats-Gzip-Test: ts/2/deflate
+> X-Ats-Compress-Test: ts/2/deflate
> Accept-Encoding: deflate
< HTTP/1.1 200 OK
< Content-Type: text/javascript
-< Content-Length: 41
+< Content-Length: 1050
+
+
> GET http://ae-0/obj0 HTTP/1.1
-> X-Ats-Gzip-Test: ts2/0/gzip
+> X-Ats-Compress-Test: ts2/0/gzip
> Accept-Encoding: gzip
< HTTP/1.1 200 OK
< Content-Type: text/javascript
< Content-Encoding: gzip
< Vary: Accept-Encoding
-< Content-Length: 60
+< Content-Length: 71
+
> GET http://ae-0/obj0 HTTP/1.1
-> X-Ats-Gzip-Test: ts2/0/gzip
+> X-Ats-Compress-Test: ts2/0/gzip
> Accept-Encoding: gzip
< HTTP/1.1 200 OK
< Content-Type: text/javascript
< Content-Encoding: gzip
< Vary: Accept-Encoding
-< Content-Length: 60
+< Content-Length: 71
+
> GET http://ae-0/obj0 HTTP/1.1
-> X-Ats-Gzip-Test: ts2/0/br
+> X-Ats-Compress-Test: ts2/0/br
> Accept-Encoding: br
< HTTP/1.1 200 OK
< Content-Type: text/javascript
< Content-Encoding: br
< Vary: Accept-Encoding
-< Content-Length: 41
+< Content-Length: 46
+
> GET http://ae-0/obj0 HTTP/1.1
-> X-Ats-Gzip-Test: ts2/0/deflate
+> X-Ats-Compress-Test: ts2/0/deflate
> Accept-Encoding: deflate
< HTTP/1.1 200 OK
< Content-Type: text/javascript
-< Content-Length: 41
+< Content-Length: 1050
+
+
> GET http://ae-1/obj1 HTTP/1.1
-> X-Ats-Gzip-Test: ts2/1/gzip
+> X-Ats-Compress-Test: ts2/1/gzip
> Accept-Encoding: gzip
< HTTP/1.1 200 OK
< Content-Type: text/javascript
< Content-Encoding: gzip
< Vary: Accept-Encoding
-< Content-Length: 60
+< Content-Length: 71
+
> GET http://ae-1/obj1 HTTP/1.1
-> X-Ats-Gzip-Test: ts2/1/gzip
+> X-Ats-Compress-Test: ts2/1/gzip
> Accept-Encoding: gzip
< HTTP/1.1 200 OK
< Content-Type: text/javascript
< Content-Encoding: gzip
< Vary: Accept-Encoding
-< Content-Length: 60
+< Content-Length: 71
+
> GET http://ae-1/obj1 HTTP/1.1
-> X-Ats-Gzip-Test: ts2/1/br
+> X-Ats-Compress-Test: ts2/1/br
> Accept-Encoding: br
< HTTP/1.1 200 OK
< Content-Type: text/javascript
-< Content-Length: 41
+< Content-Length: 1050
+
+
> GET http://ae-1/obj1 HTTP/1.1
-> X-Ats-Gzip-Test: ts2/1/deflate
+> X-Ats-Compress-Test: ts2/1/deflate
> Accept-Encoding: deflate
< HTTP/1.1 200 OK
< Content-Type: text/javascript
-< Content-Length: 41
+< Content-Length: 1050
+
+
> GET http://ae-2/obj2 HTTP/1.1
-> X-Ats-Gzip-Test: ts2/2/gzip
+> X-Ats-Compress-Test: ts2/2/gzip
> Accept-Encoding: gzip
< HTTP/1.1 200 OK
< Content-Type: text/javascript
< Content-Encoding: gzip
< Vary: Accept-Encoding
-< Content-Length: 60
+< Content-Length: 71
+
> GET http://ae-2/obj2 HTTP/1.1
-> X-Ats-Gzip-Test: ts2/2/gzip
+> X-Ats-Compress-Test: ts2/2/gzip
> Accept-Encoding: gzip
< HTTP/1.1 200 OK
< Content-Type: text/javascript
< Content-Encoding: gzip
< Vary: Accept-Encoding
-< Content-Length: 60
+< Content-Length: 71
+
> GET http://ae-2/obj2 HTTP/1.1
-> X-Ats-Gzip-Test: ts2/2/br
+> X-Ats-Compress-Test: ts2/2/br
> Accept-Encoding: br
< HTTP/1.1 200 OK
< Content-Type: text/javascript
< Content-Encoding: br
< Vary: Accept-Encoding
-< Content-Length: 41
+< Content-Length: 46
+
> GET http://ae-2/obj2 HTTP/1.1
-> X-Ats-Gzip-Test: ts2/2/deflate
+> X-Ats-Compress-Test: ts2/2/deflate
> Accept-Encoding: deflate
< HTTP/1.1 200 OK
< Content-Type: text/javascript
-< Content-Length: 41
+< Content-Length: 1050
+
+
> GET http://ae-0/obj0 HTTP/1.1
-> X-Ats-Gzip-Test: ts3/0/deflate
+> X-Ats-Compress-Test: ts3/0/deflate
> Accept-Encoding: deflate
< HTTP/1.1 200 OK
< Content-Type: text/javascript
-< Content-Length: 41
+< Content-Length: 1050
+
+
> GET http://ae-0/obj0 HTTP/1.1
-> X-Ats-Gzip-Test: ts3/0/gzip
+> X-Ats-Compress-Test: ts3/0/gzip
> Accept-Encoding: gzip
< HTTP/1.1 200 OK
< Content-Type: text/javascript
< Content-Encoding: gzip
< Vary: Accept-Encoding
-< Content-Length: 60
+< Content-Length: 71
+
> GET http://ae-0/obj0 HTTP/1.1
-> X-Ats-Gzip-Test: ts3/0/br
+> X-Ats-Compress-Test: ts3/0/br
> Accept-Encoding: br
< HTTP/1.1 200 OK
< Content-Type: text/javascript
< Content-Encoding: br
< Vary: Accept-Encoding
-< Content-Length: 41
+< Content-Length: 46
+
> GET http://ae-0/obj0 HTTP/1.1
-> X-Ats-Gzip-Test: ts3/0/deflate
+> X-Ats-Compress-Test: ts3/0/deflate
> Accept-Encoding: deflate
< HTTP/1.1 200 OK
< Content-Type: text/javascript
-< Content-Length: 41
+< Content-Length: 1050
+
+
> GET http://ae-1/obj1 HTTP/1.1
-> X-Ats-Gzip-Test: ts3/1/deflate
+> X-Ats-Compress-Test: ts3/1/deflate
> Accept-Encoding: deflate
< HTTP/1.1 200 OK
< Content-Type: text/javascript
-< Content-Length: 41
+< Content-Length: 1050
+
+
> GET http://ae-1/obj1 HTTP/1.1
-> X-Ats-Gzip-Test: ts3/1/gzip
+> X-Ats-Compress-Test: ts3/1/gzip
> Accept-Encoding: gzip
< HTTP/1.1 200 OK
< Content-Type: text/javascript
< Content-Encoding: gzip
< Vary: Accept-Encoding
-< Content-Length: 60
+< Content-Length: 71
+
> GET http://ae-1/obj1 HTTP/1.1
-> X-Ats-Gzip-Test: ts3/1/br
+> X-Ats-Compress-Test: ts3/1/br
> Accept-Encoding: br
< HTTP/1.1 200 OK
< Content-Type: text/javascript
< Content-Encoding: br
< Vary: Accept-Encoding
-< Content-Length: 41
+< Content-Length: 46
+
> GET http://ae-1/obj1 HTTP/1.1
-> X-Ats-Gzip-Test: ts3/1/deflate
+> X-Ats-Compress-Test: ts3/1/deflate
> Accept-Encoding: deflate
< HTTP/1.1 200 OK
< Content-Type: text/javascript
-< Content-Length: 41
+< Content-Length: 1050
+
+
> GET http://ae-2/obj2 HTTP/1.1
-> X-Ats-Gzip-Test: ts3/2/deflate
+> X-Ats-Compress-Test: ts3/2/deflate
> Accept-Encoding: deflate
< HTTP/1.1 200 OK
< Content-Type: text/javascript
-< Content-Length: 41
+< Content-Length: 1050
+
+
> GET http://ae-2/obj2 HTTP/1.1
-> X-Ats-Gzip-Test: ts3/2/gzip
+> X-Ats-Compress-Test: ts3/2/gzip
> Accept-Encoding: gzip
< HTTP/1.1 200 OK
< Content-Type: text/javascript
< Content-Encoding: gzip
< Vary: Accept-Encoding
-< Content-Length: 60
+< Content-Length: 71
+
> GET http://ae-2/obj2 HTTP/1.1
-> X-Ats-Gzip-Test: ts3/2/br
+> X-Ats-Compress-Test: ts3/2/br
> Accept-Encoding: br
< HTTP/1.1 200 OK
< Content-Type: text/javascript
< Content-Encoding: br
< Vary: Accept-Encoding
-< Content-Length: 41
+< Content-Length: 46
+
> GET http://ae-2/obj2 HTTP/1.1
-> X-Ats-Gzip-Test: ts3/2/deflate
+> X-Ats-Compress-Test: ts3/2/deflate
> Accept-Encoding: deflate
< HTTP/1.1 200 OK
< Content-Type: text/javascript
-< Content-Length: 41
+< Content-Length: 1050
+
+
diff --git a/tests/gold_tests/pluginTest/gzip/gzip.test.py b/tests/gold_tests/pluginTest/compress/compress.test.py
similarity index 67%
rename from tests/gold_tests/pluginTest/gzip/gzip.test.py
rename to tests/gold_tests/pluginTest/compress/compress.test.py
index 6523db7..818abce 100644
--- a/tests/gold_tests/pluginTest/gzip/gzip.test.py
+++ b/tests/gold_tests/pluginTest/compress/compress.test.py
@@ -19,7 +19,7 @@
import os
import subprocess
Test.Summary = '''
-Test gzip plugin
+Test compress plugin
'''
# This test case is very bare-bones. It only covers a few scenarios that have caused problems.
@@ -27,13 +27,23 @@ Test gzip plugin
# Skip if plugins not present.
#
Test.SkipUnless(
- Condition.PluginExists('gzip.so'),
+ Condition.PluginExists('compress.so'),
Condition.PluginExists('conf_remap.so'),
Condition.HasATSFeature('TS_HAS_BROTLI')
)
-server = Test.MakeOriginServer("server", options={'--load': '{}/gzip_observer.py'.format(Test.TestDirectory)})
+server = Test.MakeOriginServer("server", options={'--load': '{}/compress_observer.py'.format(Test.TestDirectory)})
+
+def repeat(str, count):
+ result = ""
+ while count > 0:
+ result += str
+ count -= 1
+ return result
+
+# Need a fairly big body, otherwise the plugin will refuse to compress
+body = repeat("lets go surfin now everybodys learnin how\n", 25)
# expected response from the origin server
response_header = {
@@ -44,7 +54,7 @@ response_header = {
"Content-Type: text/javascript\r\n" +
"\r\n",
"timestamp": "1469733493.993",
- "body": "lets go surfin now everybodys learnin how"
+ "body": body
}
for i in range(3):
# add request/response to the server dictionary
@@ -53,6 +63,13 @@ for i in range(3):
}
server.addResponse("sessionfile.log", request_header, response_header)
+def curl(ts, name, idx, encodingList):
+ return (
+ "curl --verbose --proxy http://127.0.0.1:{}".format(ts.Variables.port) +
+ " --header 'X-Ats-Compress-Test: {}/{}/{}'".format(name, idx, encodingList) +
+ " --header 'Accept-Encoding: {0}' 'http://ae-{1}/obj{1}'".format(encodingList, idx) +
+ " >> {0}/compress_long.log 2>&1 ; printf '\n\n' >> {0}/compress_long.log".format(Test.RunDirectory)
+ )
def oneTs(name, AeHdr1='gzip, deflate, sdch, br'):
global waitForServer
@@ -62,34 +79,26 @@ def oneTs(name, AeHdr1='gzip, deflate, sdch, br'):
ts = Test.MakeATSProcess(name)
ts.Disk.records_config.update({
- # 'proxy.config.diags.debug.enabled': 1,
- # 'proxy.config.diags.debug.tags': 'http|gzip|cache',
+ 'proxy.config.diags.debug.enabled': 0,
+ 'proxy.config.diags.debug.tags': 'http|compress|cache',
'proxy.config.http.normalize_ae': 0,
})
ts.Disk.remap_config.AddLine(
'map http://ae-0/ http://127.0.0.1:{}/'.format(server.Variables.Port) +
- ' @plugin=gzip.so @pparam={}/gzip.config'.format(Test.TestDirectory)
+ ' @plugin=compress.so @pparam={}/compress.config'.format(Test.TestDirectory)
)
ts.Disk.remap_config.AddLine(
'map http://ae-1/ http://127.0.0.1:{}/'.format(server.Variables.Port) +
' @plugin=conf_remap.so @pparam=proxy.config.http.normalize_ae=1' +
- ' @plugin=gzip.so @pparam={}/gzip.config'.format(Test.TestDirectory)
+ ' @plugin=compress.so @pparam={}/compress.config'.format(Test.TestDirectory)
)
ts.Disk.remap_config.AddLine(
'map http://ae-2/ http://127.0.0.1:{}/'.format(server.Variables.Port) +
' @plugin=conf_remap.so @pparam=proxy.config.http.normalize_ae=2' +
- ' @plugin=gzip.so @pparam={}/gzip2.config'.format(Test.TestDirectory)
+ ' @plugin=compress.so @pparam={}/compress2.config'.format(Test.TestDirectory)
)
- def curl(idx, encodingList):
- return (
- "curl --verbose --proxy http://127.0.0.1:{}".format(ts.Variables.port) +
- " --header 'X-Ats-Gzip-Test: {}/{}/{}'".format(name, idx, encodingList) +
- " --header 'Accept-Encoding: {0}' 'http://ae-{1}/obj{1}'".format(encodingList, idx) +
- " >> {0}/gzip_long.log 2>&1 ; printf '\n\n' >> {0}/gzip_long.log".format(Test.RunDirectory)
- )
-
for i in range(3):
tr = Test.AddTestRun()
@@ -100,20 +109,19 @@ def oneTs(name, AeHdr1='gzip, deflate, sdch, br'):
tr.Processes.Default.StartBefore(server, ready=When.PortOpen(server.Variables.Port))
waitForServer = False
tr.Processes.Default.ReturnCode = 0
- tr.Processes.Default.Command = curl(i, AeHdr1)
+ tr.Processes.Default.Command = curl(ts, name, i, AeHdr1)
tr = Test.AddTestRun()
tr.Processes.Default.ReturnCode = 0
- tr.Processes.Default.Command = curl(i, "gzip")
+ tr.Processes.Default.Command = curl(ts, name, i, "gzip")
tr = Test.AddTestRun()
tr.Processes.Default.ReturnCode = 0
- tr.Processes.Default.Command = curl(i, "br")
+ tr.Processes.Default.Command = curl(ts, name, i, "br")
tr = Test.AddTestRun()
tr.Processes.Default.ReturnCode = 0
- tr.Processes.Default.Command = curl(i, "deflate")
-
+ tr.Processes.Default.Command = curl(ts, name, i, "deflate")
waitForServer = True
@@ -124,14 +132,14 @@ oneTs("ts3", "deflate")
tr = Test.AddTestRun()
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Command = (
- r"tr -d '\r' < {1}/gzip_long.log | sed 's/\(..*\)\([<>]\)/\1\n\2/' | {0}/greplog.sh > {1}/gzip_short.log"
+ r"tr -d '\r' < {1}/compress_long.log | sed 's/\(..*\)\([<>]\)/\1\n\2/' | {0}/greplog.sh > {1}/compress_short.log"
).format(Test.TestDirectory, Test.RunDirectory)
-f = tr.Disk.File("gzip_short.log")
-f.Content = "gzip.gold"
+f = tr.Disk.File("compress_short.log")
+f.Content = "compress.gold"
# Have to comment this out, because caching does not seem to be consistent, which is disturbing.
#
# tr = Test.AddTestRun()
# tr.Processes.Default.Command = "echo"
-# f = tr.Disk.File("gzip_userver.log")
-# f.Content = "gzip_userver.gold"
+# f = tr.Disk.File("compress_userver.log")
+# f.Content = "compress_userver.gold"
diff --git a/tests/gold_tests/pluginTest/gzip/gzip2.config b/tests/gold_tests/pluginTest/compress/compress2.config
similarity index 100%
rename from tests/gold_tests/pluginTest/gzip/gzip2.config
rename to tests/gold_tests/pluginTest/compress/compress2.config
diff --git a/tests/gold_tests/pluginTest/gzip/gzip_observer.py b/tests/gold_tests/pluginTest/compress/compress_observer.py
similarity index 85%
rename from tests/gold_tests/pluginTest/gzip/gzip_observer.py
rename to tests/gold_tests/pluginTest/compress/compress_observer.py
index d61334d..b959f78 100755
--- a/tests/gold_tests/pluginTest/gzip/gzip_observer.py
+++ b/tests/gold_tests/pluginTest/compress/compress_observer.py
@@ -1,5 +1,5 @@
'''
-For gzip gold test, observer for micro-server.
+For compress gold test, observer for micro-server.
'''
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
@@ -17,10 +17,10 @@ For gzip gold test, observer for micro-server.
# See the License for the specific language governing permissions and
# limitations under the License.
-log = open('gzip_userver.log', 'w')
+log = open('compress_userver.log', 'w')
def observe(headers):
- log.write("{}\n".format(headers['X-Ats-Gzip-Test']))
+ log.write("{}\n".format(headers['X-Ats-Compress-Test']))
log.flush()
Hooks.register(Hooks.ReadRequestHook, observe)
diff --git a/tests/gold_tests/pluginTest/gzip/greplog.sh b/tests/gold_tests/pluginTest/compress/greplog.sh
similarity index 96%
rename from tests/gold_tests/pluginTest/gzip/greplog.sh
rename to tests/gold_tests/pluginTest/compress/greplog.sh
index f42f1af..b16fa48 100755
--- a/tests/gold_tests/pluginTest/gzip/greplog.sh
+++ b/tests/gold_tests/pluginTest/compress/greplog.sh
@@ -16,7 +16,7 @@
grep --text \
-e 'HTTP/' \
- -e '^> X-Ats-Gzip-Test:' \
+ -e '^> X-Ats-Compress-Test:' \
-e '^> Accept-Encoding:' \
-e '^< Content-' \
-e '^< Vary:' \
diff --git a/tests/gold_tests/pluginTest/gzip/gzip_userver.gold b/tests/gold_tests/pluginTest/gzip/gzip_userver.gold
deleted file mode 100644
index 20ce75d..0000000
--- a/tests/gold_tests/pluginTest/gzip/gzip_userver.gold
+++ /dev/null
@@ -1,19 +0,0 @@
-ts/0/gzip, deflate, sdch, br
-ts/0/gzip
-ts/0/deflate
-ts/1/gzip, deflate, sdch, br
-ts/1/br
-ts/2/gzip, deflate, sdch, br
-ts/2/gzip
-ts/2/deflate
-ts2/0/gzip
-ts2/0/br
-ts2/0/deflate
-ts2/1/gzip
-ts2/1/br
-ts2/2/gzip
-ts2/2/br
-ts2/2/deflate
-ts3/0/deflate
-ts3/1/deflate
-ts3/2/deflate
--
To stop receiving notification emails like this one, please contact
bcall@apache.org.