This is an automated email from the ASF dual-hosted git repository.
dmeden pushed a commit to branch 10-Dev
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/10-Dev by this push:
new 483828a Autest - Fix failing test(10-Dev). (#8694)
483828a is described below
commit 483828aefd1104dc61c5f0609793b6663daca4cf
Author: Damian Meden <[email protected]>
AuthorDate: Tue Feb 22 18:14:30 2022 +0000
Autest - Fix failing test(10-Dev). (#8694)
Make ssl_multicert_loader use traffic_server binary instead of
traffic_manager.
With this change the expected return code was also updated to the exit code
returned by the fatal call(EX_SOFTWARE(70)) in traffic_server.
---
tests/gold_tests/tls/ssl_multicert_loader.test.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tests/gold_tests/tls/ssl_multicert_loader.test.py
b/tests/gold_tests/tls/ssl_multicert_loader.test.py
index 1c79e7c..d22c7a5 100644
--- a/tests/gold_tests/tls/ssl_multicert_loader.test.py
+++ b/tests/gold_tests/tls/ssl_multicert_loader.test.py
@@ -20,7 +20,7 @@ Test reloading ssl_multicert.config with errors and keeping
around the old ssl c
sni_domain = 'example.com'
-ts = Test.MakeATSProcess("ts", command="traffic_manager", select_ports=True,
enable_tls=True)
+ts = Test.MakeATSProcess("ts", command="traffic_server", select_ports=True,
enable_tls=True)
server = Test.MakeOriginServer("server")
server2 = Test.MakeOriginServer("server3")
request_header = {"headers": f"GET / HTTP/1.1\r\nHost: {sni_domain}\r\n\r\n",
"timestamp": "1469733493.993", "body": ""}
@@ -95,7 +95,7 @@ tr3.Processes.Default.Streams.stderr =
Testers.IncludesExpression(f"CN={sni_doma
# Also, not explicitly setting
proxy.config.ssl.server.multicert.exit_on_load_fail
# to catch if the current default (1) changes in the future
-ts2 = Test.MakeATSProcess("ts2", command="traffic_manager", select_ports=True,
enable_tls=True)
+ts2 = Test.MakeATSProcess("ts2", command="traffic_server", select_ports=True,
enable_tls=True)
ts2.Disk.ssl_multicert_config.AddLines([
'dest_ip=* ssl_cert_name=server.pem_doesnotexist ssl_key_name=server.key',
])
@@ -105,7 +105,7 @@ tr4.Processes.Default.Command = 'echo Waiting'
tr4.Processes.Default.ReturnCode = 0
tr4.Processes.Default.StartBefore(ts2)
-ts2.ReturnCode = 2
+ts2.ReturnCode = 70 # ink_fatal will exit with EX_SOFTWARE.
ts2.Ready = 0 # Need this to be 0 because we are testing shutdown, this is to
make autest not think ats went away for a bad reason.
ts2.Streams.All = Testers.ExcludesExpression(
'Traffic Server is fully initialized',
