You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2023/04/28 03:21:11 UTC
[trafficserver] branch 9.2.x updated: Autest updates for recent versions of curl (#9653)
This is an automated email from the ASF dual-hosted git repository.
zwoop pushed a commit to branch 9.2.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/9.2.x by this push:
new 9df7f8d4d4 Autest updates for recent versions of curl (#9653)
9df7f8d4d4 is described below
commit 9df7f8d4d41bda93e1d1a3ba741a6bce53c64ef0
Author: Brian Neradt <br...@gmail.com>
AuthorDate: Thu Apr 27 22:21:04 2023 -0500
Autest updates for recent versions of curl (#9653)
Recent versions of curl have updated output. This patch updates the
autest expectations for this new output.
Co-authored-by: bneradt <bn...@yahooinc.com>
---
tests/gold_tests/connect/gold/connect_0_stderr.gold | 2 +-
tests/gold_tests/h2/h2enable.test.py | 6 +++---
tests/gold_tests/h2/h2enable_no_accept_threads.test.py | 6 +++---
tests/gold_tests/proxy_protocol/gold/test_case_0_stderr.gold | 1 -
tests/gold_tests/proxy_protocol/gold/test_case_1_stderr.gold | 1 -
5 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/tests/gold_tests/connect/gold/connect_0_stderr.gold b/tests/gold_tests/connect/gold/connect_0_stderr.gold
index 55a5d33591..33b04218a9 100644
--- a/tests/gold_tests/connect/gold/connect_0_stderr.gold
+++ b/tests/gold_tests/connect/gold/connect_0_stderr.gold
@@ -9,7 +9,7 @@
< HTTP/1.1 200 OK
``
<``
-* Proxy replied 200 to CONNECT request
+`` CONNECT ``
``
> GET /get HTTP/1.1
> Host: foo.com
diff --git a/tests/gold_tests/h2/h2enable.test.py b/tests/gold_tests/h2/h2enable.test.py
index 120f4a0893..6dedb0732b 100644
--- a/tests/gold_tests/h2/h2enable.test.py
+++ b/tests/gold_tests/h2/h2enable.test.py
@@ -71,7 +71,7 @@ tr.StillRunningAfter = server
tr.StillRunningAfter = ts
tr.Processes.Default.TimeOut = 5
tr.Processes.Default.Streams.All = Testers.ExcludesExpression("Could Not Connect", "Curl attempt should have succeeded")
-tr.Processes.Default.Streams.All += Testers.ExcludesExpression("Using HTTP2", "Curl should negotiate HTTP2")
+tr.Processes.Default.Streams.All += Testers.ExcludesExpression("[Uu]sing HTTP/?2", "Curl should negotiate HTTP2")
tr.TimeOut = 5
tr2 = Test.AddTestRun("Do negotiate h2")
@@ -82,7 +82,7 @@ tr2.StillRunningAfter = server
tr2.Processes.Default.TimeOut = 5
tr2.StillRunningAfter = ts
tr2.Processes.Default.Streams.All = Testers.ExcludesExpression("Could Not Connect", "Curl attempt should have succeeded")
-tr2.Processes.Default.Streams.All += Testers.ContainsExpression("Using HTTP2", "Curl should not negotiate HTTP2")
+tr2.Processes.Default.Streams.All += Testers.ContainsExpression("[Uu]sing HTTP/?2", "Curl should not negotiate HTTP2")
tr2.TimeOut = 5
tr2 = Test.AddTestRun("Do negotiate h2")
@@ -93,5 +93,5 @@ tr2.StillRunningAfter = server
tr2.Processes.Default.TimeOut = 5
tr2.StillRunningAfter = ts
tr2.Processes.Default.Streams.All = Testers.ExcludesExpression("Could Not Connect", "Curl attempt should have succeeded")
-tr2.Processes.Default.Streams.All += Testers.ContainsExpression("Using HTTP2", "Curl should not negotiate HTTP2")
+tr2.Processes.Default.Streams.All += Testers.ContainsExpression("[Uu]sing HTTP/?2", "Curl should not negotiate HTTP2")
tr2.TimeOut = 5
diff --git a/tests/gold_tests/h2/h2enable_no_accept_threads.test.py b/tests/gold_tests/h2/h2enable_no_accept_threads.test.py
index b7c55a0115..91af61f15e 100644
--- a/tests/gold_tests/h2/h2enable_no_accept_threads.test.py
+++ b/tests/gold_tests/h2/h2enable_no_accept_threads.test.py
@@ -70,7 +70,7 @@ tr.StillRunningAfter = server
tr.StillRunningAfter = ts
tr.Processes.Default.TimeOut = 5
tr.Processes.Default.Streams.All = Testers.ExcludesExpression("Could Not Connect", "Curl attempt should have succeeded")
-tr.Processes.Default.Streams.All += Testers.ExcludesExpression("Using HTTP2", "Curl should negotiate HTTP2")
+tr.Processes.Default.Streams.All += Testers.ExcludesExpression("[Uu]sing HTTP/?2", "Curl should negotiate HTTP2")
tr.TimeOut = 5
tr2 = Test.AddTestRun("Do negotiate h2")
@@ -80,7 +80,7 @@ tr2.StillRunningAfter = server
tr2.Processes.Default.TimeOut = 5
tr2.StillRunningAfter = ts
tr2.Processes.Default.Streams.All = Testers.ExcludesExpression("Could Not Connect", "Curl attempt should have succeeded")
-tr2.Processes.Default.Streams.All += Testers.ContainsExpression("Using HTTP2", "Curl should not negotiate HTTP2")
+tr2.Processes.Default.Streams.All += Testers.ContainsExpression("[Uu]sing HTTP/?2", "Curl should not negotiate HTTP2")
tr2.TimeOut = 5
tr2 = Test.AddTestRun("Do negotiate h2")
@@ -91,5 +91,5 @@ tr2.StillRunningAfter = server
tr2.Processes.Default.TimeOut = 5
tr2.StillRunningAfter = ts
tr2.Processes.Default.Streams.All = Testers.ExcludesExpression("Could Not Connect", "Curl attempt should have succeeded")
-tr2.Processes.Default.Streams.All += Testers.ContainsExpression("Using HTTP2", "Curl should not negotiate HTTP2")
+tr2.Processes.Default.Streams.All += Testers.ContainsExpression("[Uu]sing HTTP/?2", "Curl should not negotiate HTTP2")
tr2.TimeOut = 5
diff --git a/tests/gold_tests/proxy_protocol/gold/test_case_0_stderr.gold b/tests/gold_tests/proxy_protocol/gold/test_case_0_stderr.gold
index 903ab390ed..f7ae430791 100644
--- a/tests/gold_tests/proxy_protocol/gold/test_case_0_stderr.gold
+++ b/tests/gold_tests/proxy_protocol/gold/test_case_0_stderr.gold
@@ -1,5 +1,4 @@
``
-> PROXY TCP4 127.0.0.1 127.0.0.1 ``
> GET /get HTTP/1.1
> Host: localhost:``
> User-Agent: curl/``
diff --git a/tests/gold_tests/proxy_protocol/gold/test_case_1_stderr.gold b/tests/gold_tests/proxy_protocol/gold/test_case_1_stderr.gold
index 903ab390ed..f7ae430791 100644
--- a/tests/gold_tests/proxy_protocol/gold/test_case_1_stderr.gold
+++ b/tests/gold_tests/proxy_protocol/gold/test_case_1_stderr.gold
@@ -1,5 +1,4 @@
``
-> PROXY TCP4 127.0.0.1 127.0.0.1 ``
> GET /get HTTP/1.1
> Host: localhost:``
> User-Agent: curl/``