From 8f0ff34c3760c7358bada551361c30bf6ee3ee75 Mon Sep 17 00:00:00 2001 From: Chris McFarlen Date: Wed, 29 Jul 2026 09:32:51 -0500 Subject: [PATCH] tests: use ssl_multicert.config form in two 10.2.x autests http2_max_active_streams and tls_secret_update_default used the ssl_multicert.yaml Disk API, which the 10.2.x autest harness does not provide -- it registers ssl_multicert.config -- so both tests threw AttributeError at load time. Convert them to the flat ssl_multicert.config form already used by other tests on the branch. For tls_secret_update_default this also updates the reload touch target and the diags.log wait condition, which looked for "ssl_multicert.yaml finished loading"; on 10.2.x the SSL loader logs the actual filename (ssl_multicert.config), so the reload wait would otherwise never become ready. These tests were backported (via #13386 and #13342) without adapting their config-file format to the release branch. --- .../h2/http2_max_active_streams.test.py | 8 +------- .../tls/tls_secret_update_default.test.py | 15 +++++---------- 2 files changed, 6 insertions(+), 17 deletions(-) diff --git a/tests/gold_tests/h2/http2_max_active_streams.test.py b/tests/gold_tests/h2/http2_max_active_streams.test.py index 42fb1d627f8..f889895c608 100644 --- a/tests/gold_tests/h2/http2_max_active_streams.test.py +++ b/tests/gold_tests/h2/http2_max_active_streams.test.py @@ -53,13 +53,7 @@ def run(self) -> None: 'proxy.config.http2.max_concurrent_streams_in': 100, }) ts.Disk.remap_config.AddLine(f'map / http://127.0.0.1:{server.Variables.http_port}') - 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') tr.Processes.Default.StartBefore(server) tr.Processes.Default.StartBefore(ts) diff --git a/tests/gold_tests/tls/tls_secret_update_default.test.py b/tests/gold_tests/tls/tls_secret_update_default.test.py index ae530c70ad8..93e56a3ea27 100644 --- a/tests/gold_tests/tls/tls_secret_update_default.test.py +++ b/tests/gold_tests/tls/tls_secret_update_default.test.py @@ -87,15 +87,10 @@ def _configure_traffic_server(self) -> 'Process': 'proxy.config.url_remap.pristine_host_hdr': 1, }) - ts.Disk.ssl_multicert_yaml.AddLines( + ts.Disk.ssl_multicert_config.AddLines( [ - 'ssl_multicert:', - ' - dest_ip: "*"', - f' ssl_cert_name: {self.initial_cert}', - f' ssl_key_name: {self.key_file}', - ' - dest_ip: "*"', - f' ssl_cert_name: {self.shadowed_cert}', - f' ssl_key_name: {self.shadowed_key_file}', + f'dest_ip=* ssl_cert_name={self.initial_cert} ssl_key_name={self.key_file}', + f'dest_ip=* ssl_cert_name={self.shadowed_cert} ssl_key_name={self.shadowed_key_file}', ]) ts.Disk.remap_config.AddLine(f'map / http://127.0.0.1:{self._server.Variables.Port}') return ts @@ -122,7 +117,7 @@ def _add_config_reload_run(self) -> 'TestRun': def _add_config_touch_run(self) -> 'TestRun': '''Mark the multicert configuration for reload.''' tr = Test.AddTestRun('Mark the multicert configuration for reload') - tr.Processes.Default.Command = f'touch {self._ts.Disk.ssl_multicert_yaml.AbsPath}' + tr.Processes.Default.Command = f'touch {self._ts.Disk.ssl_multicert_config.AbsPath}' tr.Processes.Default.ReturnCode = 0 self._keep_processes_running(tr) return tr @@ -134,7 +129,7 @@ def _add_config_reload_wait_run(self) -> 'TestRun': tr.Processes.Default.Env = self._ts.Env tr.Processes.Default.ReturnCode = 0 await_reload = tr.Processes.Process('await_reload', 'sleep 30') - await_reload.Ready = When.FileContains(self._ts.Disk.diags_log.Name, 'ssl_multicert.yaml finished loading', 2) + await_reload.Ready = When.FileContains(self._ts.Disk.diags_log.Name, 'ssl_multicert.config finished loading', 2) tr.Processes.Default.StartBefore(await_reload) self._keep_processes_running(tr) return tr