This is an automated email from the ASF dual-hosted git repository.
bneradt 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 73670a3c6c autest updates for recent curl and nghttp2 versions (#12165)
73670a3c6c is described below
commit 73670a3c6cf83c3eb01b9d62e15e37b3698075f7
Author: Brian Neradt <[email protected]>
AuthorDate: Mon Apr 7 15:36:26 2025 -0500
autest updates for recent curl and nghttp2 versions (#12165)
* number_of_redirects.test.py: curl verbosity change
Change curl verbosity of number_of_redirects.test.py to -v from -vvv
since in later versions of curl, the output of -vvv no longer matches
the gold file.
* chunked_encoding_h2: make content-length search specific
Later versions of nghttp2 now include content-length headers in the
request generated by chunked_encoding_h2. Therefore the search strings
for the responses have to be more specific to look in server responses
only otherwise they see the content-length in the request and
incorrectly fail.
* compress.test.py: update for recent curl output
Recent versions of curl add a 'using HTTP/2' string to the output that
the compress.test.py test has to filter out.
* connect.test.py: accommodate curl output order changes
Recent versions of curl switch the order of the "Connected to" CONNECT
information with respect to the rest of the verbose output content. This
updates the test expectations to accommodate that.
* cripts autests updates
This allows the cripts.test.py file to work in generic environments
rather than just those that install into /tmp/ats.
* polite_hook_wait.test.py: update for recent curl output
Update the polite_hook_wait.test.py so that it can handle recent curl
output that adds a 'using HTTP/1.x' or similar strings to the output.
* test_TSHttpSsnInfo.test.py: accommodate nghttp
The latest version of nghttp2 has different output that the
test_TSHttpSsnInfo.test.py gold file has to be updated to accommodate.
This updates it so that it can work for newer and older versions of the
tool.
---
.../chunked_encoding/chunked_encoding_h2.test.py | 6 +++---
tests/gold_tests/connect/connect.test.py | 2 ++
.../gold_tests/connect/gold/connect_0_stderr.gold | 2 --
tests/gold_tests/cripts/cripts.test.py | 25 ++++++++++++++++------
.../pluginTest/compress/compress.test.py | 4 ++--
tests/gold_tests/pluginTest/compress/greplog.sh | 4 +++-
.../polite_hook_wait/polite_hook_wait.test.py | 4 +++-
.../pluginTest/tsapi/test_TSHttpSsnInfo.test.py | 12 ++++++-----
.../tsapi/test_TSHttpSsnInfo_nghttp0.gold | 18 ++++------------
.../redirect/number_of_redirects.test.py | 2 +-
10 files changed, 44 insertions(+), 35 deletions(-)
diff --git a/tests/gold_tests/chunked_encoding/chunked_encoding_h2.test.py
b/tests/gold_tests/chunked_encoding/chunked_encoding_h2.test.py
index ac823deb98..318a1d5eaa 100644
--- a/tests/gold_tests/chunked_encoding/chunked_encoding_h2.test.py
+++ b/tests/gold_tests/chunked_encoding/chunked_encoding_h2.test.py
@@ -71,7 +71,7 @@ tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.StartBefore(Test.Processes.ts)
tr.Processes.Default.StartBefore(delay_server)
tr.Processes.Default.Streams.All = Testers.ExcludesExpression("RST_STREAM",
"Delayed chunk close should not cause reset")
-tr.Processes.Default.Streams.All +=
Testers.ExcludesExpression("content-length", "Should return chunked")
+tr.Processes.Default.Streams.All += Testers.ExcludesExpression("<
content-length", "Should return chunked")
tr.Processes.Default.Streams.All += Testers.ContainsExpression(":status: 200",
"Should get successful response")
tr.StillRunningAfter = ts
# No resets in the output
@@ -86,7 +86,7 @@ tr.MakeCurlCommand(
ts.Variables.ssl_port))
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.All = Testers.ContainsExpression("HTTP/2 200",
"Request should succeed")
-tr.Processes.Default.Streams.All +=
Testers.ContainsExpression("content-length:", "Response should include content
length")
+tr.Processes.Default.Streams.All += Testers.ContainsExpression("<
content-length:", "Response should include content length")
server2_out = Testers.ContainsExpression("Transfer-Encoding: chunked",
"Request should be chunked encoded")
# No content-length in header
# Transfer encoding to origin, but no content-length
@@ -101,7 +101,7 @@ tr.MakeCurlCommand(
ts.Variables.ssl_port))
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.All = Testers.ContainsExpression("HTTP/2 200",
"Request should succeed")
-tr.Processes.Default.Streams.All +=
Testers.ExcludesExpression("content-length:", "Response should not include
content length")
+tr.Processes.Default.Streams.All += Testers.ExcludesExpression("<
content-length:", "Response should not include content length")
server3_out = Testers.ContainsExpression("Transfer-Encoding: chunked",
"Request should be chunked encoded")
# No content length in header
# Transfer encoding to origin, but no content-length
diff --git a/tests/gold_tests/connect/connect.test.py
b/tests/gold_tests/connect/connect.test.py
index bb00fa4ec4..f6ff46670c 100644
--- a/tests/gold_tests/connect/connect.test.py
+++ b/tests/gold_tests/connect/connect.test.py
@@ -87,6 +87,8 @@ logging:
tr.MakeCurlCommand(f"-v --fail -s -p -x
127.0.0.1:{self.ts.Variables.port} 'http://foo.com/get'")
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stderr = "gold/connect_0_stderr.gold"
+ tr.Processes.Default.Streams.stderr = Testers.ContainsExpression(
+ f'Connected to 127.0.0.1.*{self.ts.Variables.port}', 'Curl should
connect through the ATS proxy port.')
tr.Processes.Default.TimeOut = 3
self.__checkProcessAfter(tr)
diff --git a/tests/gold_tests/connect/gold/connect_0_stderr.gold
b/tests/gold_tests/connect/gold/connect_0_stderr.gold
index 48aad129bc..e8b13580d1 100644
--- a/tests/gold_tests/connect/gold/connect_0_stderr.gold
+++ b/tests/gold_tests/connect/gold/connect_0_stderr.gold
@@ -1,6 +1,4 @@
``
-* Connected to `` (127.0.0.1) port ``
-``
* Establish HTTP proxy tunnel to foo.com:80
> CONNECT foo.com:80 HTTP/1.1
> Host: foo.com:80
diff --git a/tests/gold_tests/cripts/cripts.test.py
b/tests/gold_tests/cripts/cripts.test.py
index 180f7227af..1e6b9ba7e0 100644
--- a/tests/gold_tests/cripts/cripts.test.py
+++ b/tests/gold_tests/cripts/cripts.test.py
@@ -17,6 +17,8 @@ Test basic cripts functionality
# See the License for the specific language governing permissions and
# limitations under the License.
+import os
+
Test.testName = "cripts: basic functions"
Test.Summary = '''
Simple cripts test that sets a response header back to the client
@@ -27,6 +29,7 @@ Test.ContinueOnFail = True
class CriptsBasicTest:
def __init__(self):
+ self._compiler_location = os.path.join(Test.RunDirectory,
"compiler.sh")
self.setUpOriginServer()
self.setUpTS()
@@ -44,22 +47,31 @@ class CriptsBasicTest:
def setUpTS(self):
self.ts = Test.MakeATSProcess("ts")
- self.ts.Setup.CopyAs('files/basic.cript', self.ts.Variables.CONFIGDIR)
- self.ts.Setup.CopyAs('../../../tools/cripts/compiler.sh',
"{0}/bin".format(Test.RunDirectory))
+ self.ts.Setup.Copy('files/basic.cript', self.ts.Variables.CONFIGDIR)
self.ts.Disk.records_config.update(
{
'proxy.config.diags.debug.enabled': 1,
'proxy.config.plugin.dynamic_reload_mode': 1,
- 'proxy.config.plugin.compiler_path':
"{0}/bin/compiler.sh".format(Test.RunDirectory),
+ 'proxy.config.plugin.compiler_path': self._compiler_location,
})
self.ts.Disk.remap_config.AddLine(
- 'map http://www.example.com http://127.0.0.1:{0}
@plugin=basic.cript'.format(self.server.Variables.Port))
+ f'map http://www.example.com
http://127.0.0.1:{self.server.Variables.Port} @plugin=basic.cript')
+
+ def updateCompilerForTest(self):
+ '''Update the compiler script for the install location of the ATS
process.'''
+ tr = Test.AddTestRun("Update the compiler script for the install
location of the ATS process.")
+ p = tr.Processes.Default
+ compiler_source = os.path.join(p.Variables.RepoDir, 'tools', 'cripts',
'compiler.sh')
+ p.Setup.Copy(compiler_source, self._compiler_location)
+ install_dir = os.path.split(p.Variables.BINDIR)[0]
+ p.Command = f'sed -i "s|\"/tmp/ats\"|{install_dir}|g"
{self._compiler_location}'
+ p.ReturnCode = 0
def runHeaderTest(self):
- tr = Test.AddTestRun()
- tr.MakeCurlCommand('-v -H "Host: www.example.com"
http://127.0.0.1:{0}'.format(self.ts.Variables.port))
+ tr = Test.AddTestRun('Exercise traffic through cripts.')
+ tr.MakeCurlCommand(f'-v -H "Host: www.example.com"
http://127.0.0.1:{self.ts.Variables.port}')
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.StartBefore(self.server,
ready=When.PortOpen(self.server.Variables.Port))
tr.Processes.Default.StartBefore(self.ts)
@@ -67,6 +79,7 @@ class CriptsBasicTest:
tr.StillRunningAfter = self.server
def run(self):
+ self.updateCompilerForTest()
self.runHeaderTest()
diff --git a/tests/gold_tests/pluginTest/compress/compress.test.py
b/tests/gold_tests/pluginTest/compress/compress.test.py
index 7599f9f9ef..079b5406db 100644
--- a/tests/gold_tests/pluginTest/compress/compress.test.py
+++ b/tests/gold_tests/pluginTest/compress/compress.test.py
@@ -261,8 +261,8 @@ tr.Processes.Default.Command = get_verify_command(out_path,
"gunzip -k")
tr = Test.AddTestRun()
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Command = (
- r"tr -d '\r' < compress_long.log | sed 's/\(..*\)\([<>]\)/\1\n\2/' |
{0}/greplog.sh > compress_short.log").format(
- Test.TestDirectory)
+ r"tr -d '\r' < compress_long.log | sed 's/\(..*\)\([<>]\)/\1\n\2/' |
{0}/greplog.sh > compress_short.log".format(
+ Test.TestDirectory))
f = tr.Disk.File("compress_short.log")
f.Content = "compress.gold"
diff --git a/tests/gold_tests/pluginTest/compress/greplog.sh
b/tests/gold_tests/pluginTest/compress/greplog.sh
index 5148bebe69..19b9109288 100755
--- a/tests/gold_tests/pluginTest/compress/greplog.sh
+++ b/tests/gold_tests/pluginTest/compress/greplog.sh
@@ -15,7 +15,9 @@
# limitations under the License.
grep --text \
- -e 'HTTP/' \
+ -e '< HTTP/' \
+ -e '> GET' \
+ -e '> POST' \
-e '^> X-Ats-Compress-Test:' \
-e '^> Accept-Encoding:' \
-e '^< Content-' \
diff --git
a/tests/gold_tests/pluginTest/polite_hook_wait/polite_hook_wait.test.py
b/tests/gold_tests/pluginTest/polite_hook_wait/polite_hook_wait.test.py
index 6b562b3c07..0a57285d91 100644
--- a/tests/gold_tests/pluginTest/polite_hook_wait/polite_hook_wait.test.py
+++ b/tests/gold_tests/pluginTest/polite_hook_wait/polite_hook_wait.test.py
@@ -58,6 +58,8 @@ tr.MakeCurlCommand('--verbose --ipv4 --header
"Host:myhost.test" http://localhos
tr.Processes.Default.ReturnCode = 0
tr = Test.AddTestRun()
-tr.Processes.Default.Command = "grep -F HTTP/ curl.txt"
+# Later versions of curl add a "using HTTP" line to the output, so we filter it
+# out to keep this test compatible with old and new versions.
+tr.Processes.Default.Command = "grep -F HTTP/ curl.txt | grep -v 'using HTTP'"
tr.Processes.Default.Streams.stdout = "curl.gold"
tr.Processes.Default.ReturnCode = 0
diff --git a/tests/gold_tests/pluginTest/tsapi/test_TSHttpSsnInfo.test.py
b/tests/gold_tests/pluginTest/tsapi/test_TSHttpSsnInfo.test.py
index af6fb4b621..e6f19c123c 100644
--- a/tests/gold_tests/pluginTest/tsapi/test_TSHttpSsnInfo.test.py
+++ b/tests/gold_tests/pluginTest/tsapi/test_TSHttpSsnInfo.test.py
@@ -71,9 +71,11 @@ Test.Env["OUTPUT_FILE"] = log_path
# ----
# H2 SETTINGS, PRIORITY, HEADERS, CONTINUATION, DATA, GOAWAY
-tr = Test.AddTestRun()
+tr = Test.AddTestRun('HTTP/2 Test')
tr.TimeOut = 10
-tr.Processes.Default.Command = f"nghttp -vn --continuation
'https://localhost:{ts.Variables.ssl_port}/httpbin/post' -d 'post_body'"
+# grep out the continuation lines because that significantly reduces the output
+# size which exponentially reduces the gold file processing time.
+tr.Processes.Default.Command = f"nghttp -vn --continuation
'https://localhost:{ts.Variables.ssl_port}/httpbin/post' -d 'post_body' | grep
-v 'continuation-test'"
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.StartBefore(httpbin,
ready=When.PortOpen(httpbin.Variables.Port))
tr.Processes.Default.StartBefore(Test.Processes.ts)
@@ -83,7 +85,7 @@ tr.StillRunningAfter = ts
# H3
if Condition.HasATSFeature('TS_USE_QUIC') and
Condition.HasCurlFeature('http3'):
- tr = Test.AddTestRun()
+ tr = Test.AddTestRun('HTTP/3 Test')
tr.TimeOut = 10
tr.MakeCurlCommand(f"-k --http3
'https://localhost:{ts.Variables.ssl_port}/httpbin/post' -d 'post_body'")
tr.Processes.Default.ReturnCode = 0
@@ -91,13 +93,13 @@ if Condition.HasATSFeature('TS_USE_QUIC') and
Condition.HasCurlFeature('http3'):
tr.StillRunningAfter = httpbin
tr.StillRunningAfter = ts
-tr = Test.AddTestRun()
+tr = Test.AddTestRun('Check the log output')
tr.Processes.Default.Command = "echo check log"
tr.Processes.Default.ReturnCode = 0
f = tr.Disk.File(log_path)
f.Content = "test_TSHttpSsnInfo_plugin_log.gold"
f.Content += Testers.ContainsExpression(
- "H2 Frames Received:D1,H1,PR5,RS0,S2,PP0,P0,G1,WU0,C1,U0", "Expected
numbers of frames should be received")
+ "H2 Frames Received:D1,H1,PR.,RS0,S2,PP0,P0,G1,WU0,C1,U0", "Expected
numbers of frames should be received")
# We cannot test this on H3 now because the test plugin does not work on H3
sessions
# f.Content += Testers.ContainsExpression("H3 Frames
Received:D1,H1,Ra0,CP0,S1,PP0,Rb0,G0,Rc0,Rd0,UND0,UND0,UND0,MPI0,U0",
# "Expected numbers of frames should be
received")
diff --git a/tests/gold_tests/pluginTest/tsapi/test_TSHttpSsnInfo_nghttp0.gold
b/tests/gold_tests/pluginTest/tsapi/test_TSHttpSsnInfo_nghttp0.gold
index 8fc661cb94..888715edc9 100644
--- a/tests/gold_tests/pluginTest/tsapi/test_TSHttpSsnInfo_nghttp0.gold
+++ b/tests/gold_tests/pluginTest/tsapi/test_TSHttpSsnInfo_nghttp0.gold
@@ -1,21 +1,11 @@
``
-[``] send PRIORITY frame <length=5, flags=0x00, stream_id=3>
- (dep_stream_id=0, weight=201, exclusive=0)
-[``] send PRIORITY frame <length=5, flags=0x00, stream_id=5>
- (dep_stream_id=0, weight=101, exclusive=0)
-[``] send PRIORITY frame <length=5, flags=0x00, stream_id=7>
- (dep_stream_id=0, weight=1, exclusive=0)
-[``] send PRIORITY frame <length=5, flags=0x00, stream_id=9>
- (dep_stream_id=7, weight=1, exclusive=0)
-[``] send PRIORITY frame <length=5, flags=0x00, stream_id=11>
- (dep_stream_id=3, weight=1, exclusive=0)
-[``] send HEADERS frame <length=``, flags=0x24, stream_id=13>
- ; END_HEADERS | PRIORITY
+[``] send HEADERS frame <length=``, flags=0x``, stream_id=``>
+ ; END_HEADER``
``
-[``] send DATA frame <length=``, flags=0x01, stream_id=13>
+[``] send DATA frame <length=``, flags=0x``, stream_id=``>
``; END_STREAM
``
-[``] recv (stream_id=13) :status: 431
+[``] recv (stream_id=``) :status: 431
``
``; END_STREAM
``
diff --git a/tests/gold_tests/redirect/number_of_redirects.test.py
b/tests/gold_tests/redirect/number_of_redirects.test.py
index 4734f88667..2c4b8108ee 100644
--- a/tests/gold_tests/redirect/number_of_redirects.test.py
+++ b/tests/gold_tests/redirect/number_of_redirects.test.py
@@ -84,7 +84,7 @@ class NumberOfRedirectionsTest:
self._tr.Processes.Default.StartBefore(self._dns)
self._tr.Processes.Default.StartBefore(self._ts)
self._tr.MakeCurlCommand(
- "-L -vvv a.test/ping --proxy 127.0.0.1:{0} -H 'uuid:
redirect_test_1'".format(self._ts.Variables.port))
+ "-L -v a.test/ping --proxy 127.0.0.1:{0} -H 'uuid:
redirect_test_1'".format(self._ts.Variables.port))
self._tr.Processes.Default.Streams.All =
f"gold/number_of_redirections_{self._numberOfRedirections}.gold"
self._tr.ReturnCode = 0
self._tr.StillRunningAfter = self._ts
