This is an automated email from the ASF dual-hosted git repository.
cmcfarlen pushed a commit to branch 10.2.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/10.2.x by this push:
new 95fdf9f8bf [10.2.x] Fix unit test & AuTest (#13341)
95fdf9f8bf is described below
commit 95fdf9f8bffd730adb9cfb5e714a63b2003b1772
Author: Masaori Koshiba <[email protected]>
AuthorDate: Tue Jul 7 07:21:36 2026 +0900
[10.2.x] Fix unit test & AuTest (#13341)
* proxy/unit_tests: restore IpAllow::subjects stub definition
#13278 dropped this definition, but test_proxy links ts::http
(which references IpAllow::subjects) ahead of ts::proxy (which
defines it). GNU ld's single-pass archive scan then leaves the
symbol unresolved, breaking the Linux build; macOS links fine.
master avoids this incidentally via test_PluginYAML.cc from the
unbackported plugin.yaml migration (#13070).
* tls autests: use ssl_multicert.config instead of yaml
These tests were backported from master, where the default cert
config is ssl_multicert.yaml and the harness exposes
ts.Disk.ssl_multicert_yaml. On 10.2.x the default is still legacy
ssl_multicert.config and no ssl_multicert_yaml Disk attribute is
registered, so the tests failed at collection. Switch them to the
ssl_multicert.config one-liner used by the other 10.2.x TLS tests.
* curl 8.20 test update: curl PROXY destination changes (#13239)
curl 8.20 intentionally mirrors --haproxy-clientip into both PROXY
addresses to keep the header address family consistent. The
TSVConnPPInfo AuTest still expected the older destination address, so
jobs with newer curl failed even though ATS preserved the PROXY metadata
it received.
This relaxes the destination-address expectation to accept either curl
behavior while continuing to verify the source address and PROXY
metadata. This also wraps the long curl command strings while leaving
the test's request flow unchanged.
(cherry picked from commit ad0ce02abf550455896167fa79ca1224f939cf1c)
* fedora:44: Trim remap ACL reload waits (#13237)
The remap ACL AuTests run hundreds of reload scenarios in a single case,
and the Fedora 44 shard is sensitive to extra reload-wait overhead,
causing the tests to hang. Their reload sentinel also counted only
explicit reloads, even though the log contains the startup load marker
too.
This replaces the long-lived sleep Ready helper with a short command
that exits once the expected reload marker count is present. This also
waits for the startup marker plus the explicit reload count, so each
scenario observes the reload it just requested.
(cherry picked from commit c52eeda1b85149d7b1ddda091baf918a6816da91)
---------
Co-authored-by: Brian Neradt <[email protected]>
---
src/proxy/unit_tests/stub.cc | 2 +
tests/gold_tests/remap/remap_acl.test.py | 12 ++--
tests/gold_tests/tls/tls_flow_control.test.py | 8 +--
tests/gold_tests/tls/tls_record_size.test.py | 8 +--
tests/gold_tests/tls/tls_reload_under_load.test.py | 12 +---
tests/gold_tests/tls/tls_renegotiation.test.py | 8 +--
.../tls/tls_renegotiation_allowed.test.py | 8 +--
tests/tools/condwait | 66 ++++++++++++++++++----
8 files changed, 71 insertions(+), 53 deletions(-)
diff --git a/src/proxy/unit_tests/stub.cc b/src/proxy/unit_tests/stub.cc
index ba279051a3..a1a95fe8cc 100644
--- a/src/proxy/unit_tests/stub.cc
+++ b/src/proxy/unit_tests/stub.cc
@@ -22,3 +22,5 @@
*/
#include "proxy/IPAllow.h"
+
+uint8_t IpAllow::subjects[IpAllow::Subject::MAX_SUBJECTS];
diff --git a/tests/gold_tests/remap/remap_acl.test.py
b/tests/gold_tests/remap/remap_acl.test.py
index 6aec7b8ad3..0f5b0f5f23 100644
--- a/tests/gold_tests/remap/remap_acl.test.py
+++ b/tests/gold_tests/remap/remap_acl.test.py
@@ -166,13 +166,13 @@ class Test_remap_acl:
#
tr = Test.AddTestRun("Await config reload")
p = tr.Processes.Default
- p.Command = 'echo awaiting config reload'
- p.Env = ts.Env
Test_remap_acl._ts_reload_counter += 1
- count = Test_remap_acl._ts_reload_counter
- await_config_reload =
tr.Processes.Process(f'config_reload_succeeded_{count}', 'sleep 30')
- await_config_reload.Ready =
When.FileContains(ts.Disk.diags_log.Name, "remap.config finished loading",
count)
- p.StartBefore(await_config_reload)
+ count = 1 + Test_remap_acl._ts_reload_counter
+ condwait = os.path.join(Test.Variables.AtsTestToolsDir, 'condwait')
+ p.Command = (f"'{condwait}' 30 --contains
'{ts.Disk.diags_log.Name}' "
+ f"'remap.config finished loading' {count}")
+ p.Env = ts.Env
+ tr.StillRunningAfter = ts
else:
record_config = {
diff --git a/tests/gold_tests/tls/tls_flow_control.test.py
b/tests/gold_tests/tls/tls_flow_control.test.py
index f1da922182..4ff3886f6e 100644
--- a/tests/gold_tests/tls/tls_flow_control.test.py
+++ b/tests/gold_tests/tls/tls_flow_control.test.py
@@ -70,13 +70,7 @@ class TestTlsFlowControl:
TestTlsFlowControl._ts_counter += 1
ts.addDefaultSSLFiles()
- ts.Disk.ssl_multicert_yaml.AddLines(
- """
-ssl_multicert:
- - dest_ip: "*"
- ssl_cert_name: server.pem
- ssl_key_name: server.key
-""".split("\n"))
+ ts.Disk.ssl_multicert_config.AddLine('dest_ip=*
ssl_cert_name=server.pem ssl_key_name=server.key')
ts.Disk.remap_config.AddLine(f'map /
http://127.0.0.1:{self._server.Variables.Port}')
ts.Disk.records_config.update(
{
diff --git a/tests/gold_tests/tls/tls_record_size.test.py
b/tests/gold_tests/tls/tls_record_size.test.py
index b40c33a6fa..da1960a30d 100644
--- a/tests/gold_tests/tls/tls_record_size.test.py
+++ b/tests/gold_tests/tls/tls_record_size.test.py
@@ -75,13 +75,7 @@ class TestRecordSizeClamp:
TestRecordSizeClamp._ts_counter += 1
ts.addDefaultSSLFiles()
- ts.Disk.ssl_multicert_yaml.AddLines(
- """
-ssl_multicert:
- - dest_ip: "*"
- ssl_cert_name: server.pem
- ssl_key_name: server.key
-""".split("\n"))
+ ts.Disk.ssl_multicert_config.AddLine('dest_ip=*
ssl_cert_name=server.pem ssl_key_name=server.key')
ts.Disk.remap_config.AddLine(f'map /
http://127.0.0.1:{self._server.Variables.Port}')
ts.Disk.records_config.update(
{
diff --git a/tests/gold_tests/tls/tls_reload_under_load.test.py
b/tests/gold_tests/tls/tls_reload_under_load.test.py
index 1828da760d..1726a112d7 100644
--- a/tests/gold_tests/tls/tls_reload_under_load.test.py
+++ b/tests/gold_tests/tls/tls_reload_under_load.test.py
@@ -1,6 +1,6 @@
'''
Existing cert/SNI reload tests reload while the server is idle. This one drives
-continuous concurrent TLS handshakes and reloads ssl_multicert.yaml on top of
+continuous concurrent TLS handshakes and reloads ssl_multicert.config on top of
them, stressing the SSL/BIO ownership boundary of the layered TLS VConnection.
The swapped-in certificate must take effect, every handshake must succeed, and
ATS must not crash.
@@ -51,13 +51,7 @@ class TestTlsReloadUnderLoad:
ts.addSSLfile("ssl/signed-bar.key")
ts.addSSLfile("ssl/signed2-bar.pem")
- ts.Disk.ssl_multicert_yaml.AddLines(
- """
-ssl_multicert:
- - dest_ip: "*"
- ssl_cert_name: signed-bar.pem
- ssl_key_name: signed-bar.key
-""".split("\n"))
+ ts.Disk.ssl_multicert_config.AddLine('dest_ip=*
ssl_cert_name=signed-bar.pem ssl_key_name=signed-bar.key')
ts.Disk.records_config.update(
{
'proxy.config.ssl.server.cert.path': f'{ts.Variables.SSLDir}',
@@ -69,7 +63,7 @@ ssl_multicert:
# The reload must actually have run (otherwise the test would be
vacuous).
ts.Disk.diags_log.Content = Testers.ContainsExpression(
- "ssl_multicert.yaml finished loading", "the cert configuration
must reload while load is in flight")
+ "ssl_multicert.config finished loading", "the cert configuration
must reload while load is in flight")
# The reload-under-load must not crash or trip an assertion /
sanitizer.
ts.Disk.traffic_out.Content = Testers.ExcludesExpression(
"received signal|failed assertion", "ATS must not crash reloading
certs under load")
diff --git a/tests/gold_tests/tls/tls_renegotiation.test.py
b/tests/gold_tests/tls/tls_renegotiation.test.py
index 70fecc14df..a65979bb23 100644
--- a/tests/gold_tests/tls/tls_renegotiation.test.py
+++ b/tests/gold_tests/tls/tls_renegotiation.test.py
@@ -61,13 +61,7 @@ class TestRenegotiationRefused:
ts.addSSLfile("ssl/server.pem")
ts.addSSLfile("ssl/server.key")
- ts.Disk.ssl_multicert_yaml.AddLines(
- """
-ssl_multicert:
- - dest_ip: "*"
- ssl_cert_name: server.pem
- ssl_key_name: server.key
-""".split("\n"))
+ ts.Disk.ssl_multicert_config.AddLine('dest_ip=*
ssl_cert_name=server.pem ssl_key_name=server.key')
ts.Disk.records_config.update(
{
'proxy.config.ssl.server.cert.path': f'{ts.Variables.SSLDir}',
diff --git a/tests/gold_tests/tls/tls_renegotiation_allowed.test.py
b/tests/gold_tests/tls/tls_renegotiation_allowed.test.py
index a5f58ff358..c903bfcd0b 100644
--- a/tests/gold_tests/tls/tls_renegotiation_allowed.test.py
+++ b/tests/gold_tests/tls/tls_renegotiation_allowed.test.py
@@ -83,13 +83,7 @@ class TestRenegotiationAllowed:
ts.addSSLfile("ssl/server.pem")
ts.addSSLfile("ssl/server.key")
- ts.Disk.ssl_multicert_yaml.AddLines(
- """
-ssl_multicert:
- - dest_ip: "*"
- ssl_cert_name: server.pem
- ssl_key_name: server.key
-""".split("\n"))
+ ts.Disk.ssl_multicert_config.AddLine('dest_ip=*
ssl_cert_name=server.pem ssl_key_name=server.key')
ts.Disk.records_config.update(
{
'proxy.config.ssl.server.cert.path': f'{ts.Variables.SSLDir}',
diff --git a/tests/tools/condwait b/tests/tools/condwait
index 0f208f168f..2a627f9889 100755
--- a/tests/tools/condwait
+++ b/tests/tools/condwait
@@ -23,6 +23,7 @@
#
# CONDITION is the ('test' command) condition to wait for. (It may contain
white space.)
# For file existence tests (-f, -e, -d), glob patterns are supported (e.g., -f
/path/crash-*.log).
+# Use "--contains FILE PATTERN COUNT" to wait until FILE contains PATTERN in
at least COUNT lines.
#
# MAX-WAIT is the maximum number of seconds to wait for the condition. If it
is omitted, it defaults to 60.
#
@@ -34,8 +35,13 @@
WAIT=60
POST_WAIT=0
+usage() {
+ echo "usage: condwait [ MAX-WAIT [ POST-WAIT ] ] TEST-CONDITION" >&2
+ echo " condwait [ MAX-WAIT [ POST-WAIT ] ] --contains FILE PATTERN
COUNT" >&2
+}
+
if [[ "$1" = "" ]] ; then
- echo "usage: condwait [ MAX-WAIT [ POST-WAIT ] ] TEST-CONDTION" >&2
+ usage
exit 1
fi
@@ -44,7 +50,7 @@ if [[ "$X" = "$1" ]] ; then
WAIT=$1
shift
if [[ "$1" = "" ]] ; then
- echo "usage: condwait [ MAX-WAIT [ POST-WAIT ] ] TEST-CONDTION" >&2
+ usage
exit 1
fi
X=$( echo "$1" | sed 's/x/yy/g' | sed 's/[^0-9]/x/g' )
@@ -55,24 +61,64 @@ if [[ "$X" = "$1" ]] ; then
fi
if [[ "$1" = "" ]] ; then
- echo "usage: condwait [ MAX-WAIT [ POST-WAIT ] ] TEST-CONDTION" >&2
+ usage
exit 1
fi
-# Check if this is a simple file existence test (-f, -e, -d). If so, use ls -d
-# which handles glob patterns properly. Otherwise, use test for the condition.
+if [[ "$1" = "--contains" ]]; then
+ if [[ $# -ne 4 ]] || ! [[ "$4" =~ ^[0-9]+$ ]]; then
+ usage
+ exit 1
+ fi
+fi
+
+# Check simple file existence tests (-f, -e, -d) specially so literal paths
with
+# whitespace work while glob patterns remain supported.
check_condition() {
- if [[ "$1" = "-f" || "$1" = "-e" || "$1" = "-d" ]] && [[ $# -eq 2 ]]; then
- # Use ls -d for file existence tests to support glob patterns.
- ls -d $2 >/dev/null 2>&1
+ if [[ "$1" = "--contains" ]]; then
+ [[ -f "$2" ]] || return 1
+ local matches
+ matches=$(awk -v pattern="$3" -v expected="$4" '
+ BEGIN {
+ if (expected == 0) {
+ print 0
+ found = 1
+ exit
+ }
+ }
+ index($0, pattern) {
+ count++
+ if (count >= expected) {
+ print count
+ found = 1
+ exit
+ }
+ }
+ END {
+ if (!found) {
+ print count + 0
+ }
+ }
+ ' "$2")
+ (( matches >= $4 ))
+ elif [[ "$1" = "-f" || "$1" = "-e" || "$1" = "-d" ]] && [[ $# -eq 2 ]];
then
+ if [[ "$2" = *[\*\?\[]* ]]; then
+ # Use compgen for file existence tests to support glob patterns.
+ local match
+ while IFS= read -r match; do
+ test "$1" "$match" && return 0
+ done < <(compgen -G "$2")
+ return 1
+ fi
+ test "$1" "$2"
else
- test $*
+ test "$@"
fi
}
while (( WAIT > 0 ))
do
- if check_condition $*
+ if check_condition "$@"
then
if (( POST_WAIT > 0 ))
then
