You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by cm...@apache.org on 2024/04/29 21:20:26 UTC
(trafficserver) branch 10.0.x updated (7798adf304 -> f56f8976cd)
This is an automated email from the ASF dual-hosted git repository.
cmcfarlen pushed a change to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
from 7798adf304 CMake: add missing verify_remap_plugin() calls. (#11276)
new 5cce439058 http2.test.py: Name TestRun entities (#11295)
new f56f8976cd Fedora 40: autest output updates for new curl and openssl (#11296)
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
tests/gold_tests/h2/gold/http2_8_stderr.gold | 18 ---------------
tests/gold_tests/h2/gold/http2_8_stdout.gold | 19 +++++++++++++++-
tests/gold_tests/h2/http2.test.py | 26 ++++++++++++----------
tests/gold_tests/tls/h2_early_decode.py | 4 +++-
tests/gold_tests/tls/test-0rtt-s_client.py | 3 ++-
.../tls/tls_verify_override_base.test.py | 4 ++--
6 files changed, 39 insertions(+), 35 deletions(-)
delete mode 100644 tests/gold_tests/h2/gold/http2_8_stderr.gold
(trafficserver) 02/02: Fedora 40: autest output updates for new curl and openssl (#11296)
Posted by cm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cmcfarlen pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
commit f56f8976cd36d3c1dd86f7af621b4726f7c134e4
Author: Brian Neradt <br...@gmail.com>
AuthorDate: Fri Apr 26 16:56:13 2024 -0500
Fedora 40: autest output updates for new curl and openssl (#11296)
After landing this patch, all autests should now work with fedora:40.
* http2.test.py: normalize curl output for "bytes data"
* tls_verify_override_base.test.py: --resolv -> --resolve
Somehow older versions of curl perimissively let the user accidentally
pass `--resolv` instead of `--resolve`. 8.7.1 seems more picky. This
fixes all references to `--resolv` to `--resolve` in the autests.
* tls_0rtt_server.test.py: new openssl s_client output
openssl s_client 3.2 has slightly different output that the
tls_0rtt_server.test.py test needs to be updated to handle. This adds
logic to handle that new output.
(cherry picked from commit 5d01b8c858ba531d90c216eed5778d87c9018ca8)
---
tests/gold_tests/h2/gold/http2_8_stderr.gold | 18 ------------------
tests/gold_tests/h2/gold/http2_8_stdout.gold | 19 ++++++++++++++++++-
tests/gold_tests/h2/http2.test.py | 8 +++++---
tests/gold_tests/tls/h2_early_decode.py | 4 +++-
tests/gold_tests/tls/test-0rtt-s_client.py | 3 ++-
tests/gold_tests/tls/tls_verify_override_base.test.py | 4 ++--
6 files changed, 30 insertions(+), 26 deletions(-)
diff --git a/tests/gold_tests/h2/gold/http2_8_stderr.gold b/tests/gold_tests/h2/gold/http2_8_stderr.gold
deleted file mode 100644
index f5d57eb4c5..0000000000
--- a/tests/gold_tests/h2/gold/http2_8_stderr.gold
+++ /dev/null
@@ -1,18 +0,0 @@
-``
-> GET /huge_resp_hdrs HTTP/2
-> Host: ``
-> User-Agent: curl/``
-> Accept: */*
-``
-< HTTP/2 200 ``
-< server: ATS/``
-< content-length: 6
-< date: ``
-< age: ``
-< x-huge-0: 0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789ab [...]
-< x-huge-1: 0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789ab [...]
-< x-huge-2: 0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789ab [...]
-< x-huge-3: 0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789ab [...]
-< x-huge-4: 0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789ab [...]
-< x-huge-5: 0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789ab [...]
-``
diff --git a/tests/gold_tests/h2/gold/http2_8_stdout.gold b/tests/gold_tests/h2/gold/http2_8_stdout.gold
index fb1fe7d2ce..f5d57eb4c5 100644
--- a/tests/gold_tests/h2/gold/http2_8_stdout.gold
+++ b/tests/gold_tests/h2/gold/http2_8_stdout.gold
@@ -1 +1,18 @@
-200 OK``
+``
+> GET /huge_resp_hdrs HTTP/2
+> Host: ``
+> User-Agent: curl/``
+> Accept: */*
+``
+< HTTP/2 200 ``
+< server: ATS/``
+< content-length: 6
+< date: ``
+< age: ``
+< x-huge-0: 0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789ab [...]
+< x-huge-1: 0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789ab [...]
+< x-huge-2: 0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789ab [...]
+< x-huge-3: 0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789ab [...]
+< x-huge-4: 0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789ab [...]
+< x-huge-5: 0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789ab [...]
+``
diff --git a/tests/gold_tests/h2/http2.test.py b/tests/gold_tests/h2/http2.test.py
index fdd73d1419..0a24a55ffb 100644
--- a/tests/gold_tests/h2/http2.test.py
+++ b/tests/gold_tests/h2/http2.test.py
@@ -220,11 +220,13 @@ tr.StillRunningAfter = server
# Test Case 8: Huge response header
tr = Test.AddTestRun("huge response header")
-tr.Processes.Default.Command = 'curl -vs -k --http2 https://127.0.0.1:{0}/huge_resp_hdrs'.format(ts.Variables.ssl_port)
+# Different versions of curl have "bytes data" at various places in the output.
+# Normalize them by simply filtering out those lines since they are not
+# important to this test.
+tr.Processes.Default.Command = f'curl -vs -k --http2 https://127.0.0.1:{ts.Variables.ssl_port}/huge_resp_hdrs |& grep -v "bytes data"'
tr.Processes.Default.ReturnCode = 0
-tr.Processes.Default.Streams.stdout = "gold/http2_8_stdout.gold"
# Different versions of curl will have different cases for HTTP/2 field names.
-tr.Processes.Default.Streams.stderr = Testers.GoldFile("gold/http2_8_stderr.gold", case_insensitive=True)
+tr.Processes.Default.Streams.stdout = Testers.GoldFile("gold/http2_8_stdout.gold", case_insensitive=True)
tr.StillRunningAfter = server
# Test Case 9: Header Only Response - e.g. 204
diff --git a/tests/gold_tests/tls/h2_early_decode.py b/tests/gold_tests/tls/h2_early_decode.py
index 2035e2842b..9247dd2a34 100755
--- a/tests/gold_tests/tls/h2_early_decode.py
+++ b/tests/gold_tests/tls/h2_early_decode.py
@@ -213,7 +213,9 @@ class Decoder:
def decode(self, data):
temp_data = data
frames = []
- while len(temp_data) >= 9:
+ loop_limiter_count = 0
+ while len(temp_data) >= 9 and loop_limiter_count < 1000:
+ loop_limiter_count += 1
frame_header = temp_data[0:9]
frame = self.read_frame_header(frame_header)
if frame.length > len(temp_data[9:]):
diff --git a/tests/gold_tests/tls/test-0rtt-s_client.py b/tests/gold_tests/tls/test-0rtt-s_client.py
index 3bd8c08a03..4cbe4a61ec 100644
--- a/tests/gold_tests/tls/test-0rtt-s_client.py
+++ b/tests/gold_tests/tls/test-0rtt-s_client.py
@@ -69,7 +69,8 @@ def main():
data = b''
for line in lines:
line += b'\n'
- if line.startswith(bytes('SSL_connect:', 'utf-8')) or \
+ if line.startswith(bytes('Connecting to', 'utf-8')) or \
+ line.startswith(bytes('SSL_connect:', 'utf-8')) or \
line.startswith(bytes('SSL3 alert', 'utf-8')) or \
bytes('Can\'t use SSL_get_servername', 'utf-8') in line:
continue
diff --git a/tests/gold_tests/tls/tls_verify_override_base.test.py b/tests/gold_tests/tls/tls_verify_override_base.test.py
index 75c4b4abe7..807c7579dd 100644
--- a/tests/gold_tests/tls/tls_verify_override_base.test.py
+++ b/tests/gold_tests/tls/tls_verify_override_base.test.py
@@ -206,7 +206,7 @@ tr.Processes.Default.Streams.stdout = Testers.ContainsExpression("Could not conn
# Should fail
tr = Test.AddTestRun("foo-to-bar-sni-policy-servername")
-tr.Processes.Default.Command = "curl -k --resolv foo.com:{0}:127.0.0.1 https://foo.com:{0}/snipolicybarservername".format(
+tr.Processes.Default.Command = "curl -k --resolve foo.com:{0}:127.0.0.1 https://foo.com:{0}/snipolicybarservername".format(
ts.Variables.ssl_port)
tr.ReturnCode = 0
tr.StillRunningAfter = server
@@ -231,7 +231,7 @@ tr.Processes.Default.Streams.stdout = Testers.ExcludesExpression("Could not conn
# Should succeed
tr = Test.AddTestRun("bar-to-foo-sni-policy-servername")
-tr.Processes.Default.Command = "curl -k --resolv bar.com:{0}:127.0.0.1 https://bar.com:{0}/snipolicyfooservername".format(
+tr.Processes.Default.Command = "curl -k --resolve bar.com:{0}:127.0.0.1 https://bar.com:{0}/snipolicyfooservername".format(
ts.Variables.ssl_port)
tr.ReturnCode = 0
tr.StillRunningAfter = server
(trafficserver) 01/02: http2.test.py: Name TestRun entities (#11295)
Posted by cm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cmcfarlen pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
commit 5cce439058b934511d896563748b2427f62a9c12
Author: Brian Neradt <br...@gmail.com>
AuthorDate: Fri Apr 26 13:25:02 2024 -0500
http2.test.py: Name TestRun entities (#11295)
This helps identify which TestRun fails if one does.
(cherry picked from commit a80571f34a7ecba7e722223e31d37a95538dea3d)
---
tests/gold_tests/h2/http2.test.py | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/tests/gold_tests/h2/http2.test.py b/tests/gold_tests/h2/http2.test.py
index 59fe461e65..fdd73d1419 100644
--- a/tests/gold_tests/h2/http2.test.py
+++ b/tests/gold_tests/h2/http2.test.py
@@ -158,7 +158,7 @@ ts.Setup.CopyAs('h2active_timeout.py', Test.RunDirectory)
# ----
# Test Case 1: basic H2 interaction
-tr = Test.AddTestRun()
+tr = Test.AddTestRun("basic H2 interaction")
tr.Processes.Default.Command = f'{sys.executable} h2client.py {ts.Variables.ssl_port} / --verify_default_body'
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.StartBefore(server)
@@ -167,14 +167,14 @@ tr.Processes.Default.Streams.stdout = "gold/remap-200.gold"
tr.StillRunningAfter = server
# Test Case 2: Make sure all the big file gets back. Regression test for issue 1646
-tr = Test.AddTestRun()
+tr = Test.AddTestRun("big file download")
tr.Processes.Default.Command = f'{sys.executable} h2client.py {ts.Variables.ssl_port} /bigfile --repeat 2 --verify_default_body'
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stdout = "gold/bigfile.gold"
tr.StillRunningAfter = server
# Test Case 3: Chunked content
-tr = Test.AddTestRun()
+tr = Test.AddTestRun("chunked content")
tr.Processes.Default.Command = f'{sys.executable} h2client.py {ts.Variables.ssl_port} /test2 --print_body'
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stdout = "gold/chunked.gold"
@@ -183,7 +183,7 @@ tr.StillRunningAfter = server
# NOTE: Skipping this test run because traffic-replay doesn't currently support H2
# Test Case 4: Multiple request
# client_path = os.path.join(Test.Variables.AtsTestToolsDir, 'traffic-replay/')
-# tr = Test.AddTestRun()
+# tr = Test.AddTestRun("multiple request")
# tr.Processes.Default.Command = \
# (f"{sys.executable} {client_path} -type h2 -log_dir {server.Variables.DataDir} "
# f"-port {ts.Variables.port} -host '127.0.0.1' -s_port {ts.Variables.ssl_port} -v -colorize False")
@@ -192,7 +192,7 @@ tr.StillRunningAfter = server
# tr.StillRunningAfter = server
# Test Case 5: h2_active_timeout
-tr = Test.AddTestRun()
+tr = Test.AddTestRun("h2_active_timeout")
tr.Processes.Default.Command = f'{sys.executable} h2active_timeout.py {ts.Variables.ssl_port} / 4'
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.All = "gold/active_timeout.gold"
@@ -201,7 +201,7 @@ tr.StillRunningAfter = server
# Test Case 6: Post with chunked body
# While HTTP/2 does not support Transfer-encoding we pass that into curl to encourage it to not set the content length
# on the post body
-tr = Test.AddTestRun()
+tr = Test.AddTestRun("post with chunked body")
tr.Processes.Default.Command = 'curl -s -k -H "Transfer-Encoding: chunked" -d "{0}" https://127.0.0.1:{1}/postchunked'.format(
post_body, ts.Variables.ssl_port)
tr.Processes.Default.ReturnCode = 0
@@ -211,7 +211,7 @@ tr.StillRunningAfter = server
# Test Case 7: Post with big chunked body
# While HTTP/2 does not support Transfer-encoding we pass that into curl to encourage it to not set the content length
# on the post body
-tr = Test.AddTestRun()
+tr = Test.AddTestRun("post with big chunked body")
tr.Processes.Default.Command = 'curl -s -k -H "Transfer-Encoding: chunked" -d @big_post_body https://127.0.0.1:{0}/bigpostchunked'.format(
ts.Variables.ssl_port)
tr.Processes.Default.ReturnCode = 0
@@ -219,7 +219,7 @@ tr.Processes.Default.Streams.All = "gold/post_chunked.gold"
tr.StillRunningAfter = server
# Test Case 8: Huge response header
-tr = Test.AddTestRun()
+tr = Test.AddTestRun("huge response header")
tr.Processes.Default.Command = 'curl -vs -k --http2 https://127.0.0.1:{0}/huge_resp_hdrs'.format(ts.Variables.ssl_port)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stdout = "gold/http2_8_stdout.gold"
@@ -228,7 +228,7 @@ tr.Processes.Default.Streams.stderr = Testers.GoldFile("gold/http2_8_stderr.gold
tr.StillRunningAfter = server
# Test Case 9: Header Only Response - e.g. 204
-tr = Test.AddTestRun()
+tr = Test.AddTestRun("header only response")
tr.Processes.Default.Command = 'curl -vs -k --http2 https://127.0.0.1:{0}/status/204'.format(ts.Variables.ssl_port)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stdout = "gold/http2_9_stdout.gold"