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 bbc06e6637 fedora:43 autest updates (#12615)
bbc06e6637 is described below
commit bbc06e663734f5f7b7fa012b61a92debad237406
Author: Brian Neradt <[email protected]>
AuthorDate: Fri Oct 24 16:23:13 2025 -0500
fedora:43 autest updates (#12615)
This updates two autests that were failing on fedora:43:
* Python 3.14: The http2_write_threshold trickle python scripts did not
work on the newer Python 3.14, which is bit more strict about possibly
uninitialized variables. fedora:43 uses Python 3.14 instead of the
Python 3.13 of fedora:42. This tweaks the scripts to make Python 3.14
happy.
* openssl 3.5 s_client output: The tls_check_dual_cert_selection_plugin
expected different output from s_client. fedora:42 used openssl 3.2,
fedora:43 has openssl 3.5. This updates the regex expectations for
cert information to match for both versions.
---
tests/gold_tests/h2/trickle_client.py | 7 +------
tests/gold_tests/h2/trickle_server.py | 8 +++++++-
.../tls/tls_check_dual_cert_selection_plugin.test.py | 18 +++++++++---------
3 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/tests/gold_tests/h2/trickle_client.py
b/tests/gold_tests/h2/trickle_client.py
index 5b777086ff..2ef603db81 100644
--- a/tests/gold_tests/h2/trickle_client.py
+++ b/tests/gold_tests/h2/trickle_client.py
@@ -17,7 +17,6 @@
# limitations under the License.
import argparse
-from email.message import EmailMessage as HttpHeaders
import logging
import math
import socket
@@ -252,11 +251,7 @@ def send_http2_request_to_server(hostname: str, port: int,
cert_file: str, write
:return: 0 if the request was successful, 1 otherwise.
"""
- request_headers = HttpHeaders()
- request_headers.add_header(':method', 'GET')
- request_headers.add_header(':path', '/some/path')
- request_headers.add_header(':authority', hostname)
- request_headers.add_header(':scheme', 'https')
+ request_headers = {':method': 'GET', ':path': '/some/path', ':authority':
hostname, ':scheme': 'https'}
scheme = request_headers[':scheme']
replay_server = f"127.0.0.1:{port}"
diff --git a/tests/gold_tests/h2/trickle_server.py
b/tests/gold_tests/h2/trickle_server.py
index 1ccfa8fc1b..36f42bd907 100644
--- a/tests/gold_tests/h2/trickle_server.py
+++ b/tests/gold_tests/h2/trickle_server.py
@@ -358,6 +358,7 @@ def run_server(listen_port, https_pem, ca_pem) -> List[int]:
logging.info(f"Serving HTTP/2 Proxy on 127.0.0.1:{listen_port} with pem
'{https_pem}'")
pool = eventlet.GreenPool()
+ manager = None
while True:
try:
new_connection_socket, _ = listening_socket.accept()
@@ -367,7 +368,9 @@ def run_server(listen_port, https_pem, ca_pem) -> List[int]:
pool.spawn_n(manager.run_forever)
except KeyboardInterrupt as e:
logging.debug("Handling KeyboardInterrupt")
- return manager.get_data_delays()
+ if manager is not None:
+ return manager.get_data_delays()
+ return []
except SystemExit:
break
@@ -391,6 +394,9 @@ def main() -> int:
logging.basicConfig(level=log_level, format='%(asctime)s - %(levelname)s -
%(message)s')
data_delays = run_server(args.listen_port, args.cert_key, args.ca_cert)
+ if not data_delays:
+ logging.error('No data delays were recorded')
+ return 1
logging.info(f'Smallest delay: {min(data_delays)} ms')
logging.info(f'Largest delay: {max(data_delays)} ms')
average = statistics.mean(data_delays)
diff --git a/tests/gold_tests/tls/tls_check_dual_cert_selection_plugin.test.py
b/tests/gold_tests/tls/tls_check_dual_cert_selection_plugin.test.py
index c2be665da5..14b3b2fe1c 100644
--- a/tests/gold_tests/tls/tls_check_dual_cert_selection_plugin.test.py
+++ b/tests/gold_tests/tls/tls_check_dual_cert_selection_plugin.test.py
@@ -90,7 +90,7 @@ tr.Processes.Default.StartBefore(dns)
tr.Processes.Default.StartBefore(Test.Processes.ts,
ready=When.PortOpen(ts.Variables.ssl_port))
tr.StillRunningAfter = server
tr.StillRunningAfter = ts
-tr.Processes.Default.Streams.All += Testers.ContainsExpression("Peer signature
type: ECDSA", "Should select EC cert")
+tr.Processes.Default.Streams.All += Testers.ContainsExpression("Peer signature
type: (ECDSA|ecdsa_)", "Should select EC cert")
tr.Processes.Default.Streams.All += Testers.ExcludesExpression("unable to
verify the first certificate", "Correct signer")
# Should receive a RSA cert
@@ -100,7 +100,7 @@ tr.Processes.Default.Command = "echo foo | openssl s_client
-CAfile signer.pem
tr.ReturnCode = 0
tr.StillRunningAfter = server
tr.StillRunningAfter = ts
-tr.Processes.Default.Streams.All += Testers.ContainsExpression("Peer signature
type: RSA-PSS", "Should select RSA cert")
+tr.Processes.Default.Streams.All += Testers.ContainsExpression("Peer signature
type: (RSA-PSS|rsa_pss_)", "Should select RSA cert")
tr.Processes.Default.Streams.All += Testers.ExcludesExpression("unable to
verify the first certificate", "Correct signer")
# Should receive a EC cert
@@ -110,7 +110,7 @@ tr.Processes.Default.Command = "echo foo | openssl s_client
-CAfile signer.pem
tr.ReturnCode = 0
tr.StillRunningAfter = server
tr.StillRunningAfter = ts
-tr.Processes.Default.Streams.All += Testers.ContainsExpression("Peer signature
type: ECDSA", "Should select EC cert")
+tr.Processes.Default.Streams.All += Testers.ContainsExpression("Peer signature
type: (ECDSA|ecdsa_)", "Should select EC cert")
tr.Processes.Default.Streams.All += Testers.ContainsExpression("CN ?=
?group.com", "Should select a group SAN")
tr.Processes.Default.Streams.All += Testers.ExcludesExpression("unable to
verify the first certificate", "Correct signer")
@@ -121,7 +121,7 @@ tr.Processes.Default.Command = "echo foo | openssl s_client
-CAfile signer.pem
tr.ReturnCode = 0
tr.StillRunningAfter = server
tr.StillRunningAfter = ts
-tr.Processes.Default.Streams.All += Testers.ContainsExpression("Peer signature
type: RSA-PSS", "Should select RSA cert")
+tr.Processes.Default.Streams.All += Testers.ContainsExpression("Peer signature
type: (RSA-PSS|rsa_pss_)", "Should select RSA cert")
tr.Processes.Default.Streams.All += Testers.ContainsExpression("CN ?=
?group.com", "Should select a group SAN")
tr.Processes.Default.Streams.All += Testers.ExcludesExpression("unable to
verify the first certificate", "Correct signer")
@@ -132,7 +132,7 @@ tr.Processes.Default.Command = "echo foo | openssl s_client
-CAfile signer.pem
tr.ReturnCode = 0
tr.StillRunningAfter = server
tr.StillRunningAfter = ts
-tr.Processes.Default.Streams.All += Testers.ContainsExpression("Peer signature
type: RSA-PSS", "Should select RSA cert")
+tr.Processes.Default.Streams.All += Testers.ContainsExpression("Peer signature
type: (RSA-PSS|rsa_pss_)", "Should select RSA cert")
tr.Processes.Default.Streams.All += Testers.ContainsExpression("CN ?=
?group.com", "Should select a group SAN")
tr.Processes.Default.Streams.All += Testers.ExcludesExpression("unable to
verify the first certificate", "Correct signer")
@@ -143,7 +143,7 @@ tr.Processes.Default.Command = "echo foo | openssl s_client
-CAfile signer.pem
tr.ReturnCode = 0
tr.StillRunningAfter = server
tr.StillRunningAfter = ts
-tr.Processes.Default.Streams.All += Testers.ContainsExpression("Peer signature
type: ECDSA", "Should select EC cert")
+tr.Processes.Default.Streams.All += Testers.ContainsExpression("Peer signature
type: (ECDSA|ecdsa_)", "Should select EC cert")
tr.Processes.Default.Streams.All += Testers.ContainsExpression("CN ?=
?group.com", "Should select a group SAN")
tr.Processes.Default.Streams.All += Testers.ExcludesExpression("unable to
verify the first certificate", "Correct signer")
@@ -169,7 +169,7 @@ tr.DelayStart = 4
tr.ReturnCode = 0
tr.StillRunningAfter = server
tr.StillRunningAfter = ts
-tr.Processes.Default.Streams.All += Testers.ContainsExpression("Peer signature
type: RSA-PSS", "Should select RSA cert")
+tr.Processes.Default.Streams.All += Testers.ContainsExpression("Peer signature
type: (RSA-PSS|rsa_pss_)", "Should select RSA cert")
tr.Processes.Default.Streams.All += Testers.ContainsExpression("CN ?=
?foo.com", "Should select foo.com")
tr.Processes.Default.Streams.All += Testers.ContainsExpression("unable to
verify the first certificate", "Different signer")
@@ -179,7 +179,7 @@ tr.Processes.Default.Command = "echo foo | openssl s_client
-CAfile signer2.pem
tr.ReturnCode = 0
tr.StillRunningAfter = server
tr.StillRunningAfter = ts
-tr.Processes.Default.Streams.All += Testers.ContainsExpression("Peer signature
type: RSA-PSS", "Should select RSA cert")
+tr.Processes.Default.Streams.All += Testers.ContainsExpression("Peer signature
type: (RSA-PSS|rsa_pss_)", "Should select RSA cert")
tr.Processes.Default.Streams.All += Testers.ContainsExpression("CN ?=
?foo.com", "Should select foo.com")
tr.Processes.Default.Streams.All += Testers.ExcludesExpression("unable to
verify the first certificate", "Correct signer")
@@ -190,6 +190,6 @@ tr.Processes.Default.Command = "echo foo | openssl s_client
-CAfile signer.pem
tr.ReturnCode = 0
tr.StillRunningAfter = server
tr.StillRunningAfter = ts
-tr.Processes.Default.Streams.All += Testers.ContainsExpression("Peer signature
type: ECDSA", "Should select EC cert")
+tr.Processes.Default.Streams.All += Testers.ContainsExpression("Peer signature
type: (ECDSA|ecdsa_)", "Should select EC cert")
tr.Processes.Default.Streams.All += Testers.ContainsExpression("CN ?=
?foo.com", "Should select foo.com")
tr.Processes.Default.Streams.All += Testers.ExcludesExpression("unable to
verify the first certificate", "Correct signer")
