moonchen commented on code in PR #13075:
URL: https://github.com/apache/trafficserver/pull/13075#discussion_r3337096264
##########
tests/gold_tests/tls/ssl_multicert_loader.test.py:
##########
@@ -78,19 +78,13 @@
tr2.Processes.Default.Env = ts.Env
tr2.Processes.Default.ReturnCode = 0
-tr2reload = Test.AddTestRun("Reload config")
-tr2reload.StillRunningAfter = ts
+tr2reload = Test.AddConfigReload(ts, expect="fail",
expect_tasks=["ssl_multicert.yaml"], description="Reload config")
tr2reload.StillRunningAfter = server
-tr2reload.Processes.Default.Command = 'traffic_ctl config reload'
-tr2reload.Processes.Default.Env = ts.Env
-tr2reload.Processes.Default.ReturnCode = 0
-ts.Disk.diags_log.Content = Testers.ContainsExpression('ERROR: ', 'ERROR')
Review Comment:
Was this check removed on purpose?
##########
tests/gold_tests/traffic_ctl/remap_inc/remap_inc.test.py:
##########
@@ -14,16 +14,12 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-import os
-
Test.Summary = '''
Test traffic_ctl config reload with remap.config .include directive
'''
Test.ContinueOnFail = False
-Test.Setup.Copy("wait_reload.sh")
Review Comment:
Since you're removing this code, can you please also remove the file
`wait_reload.sh`
##########
tests/gold_tests/remap_yaml/remap_reload_yaml.test.py:
##########
@@ -106,15 +105,10 @@ def update_remap_yaml(path: str, lines: list) -> None:
url: http://bravo.ex:{pv_port}
'''.split("\n")))
-tr = Test.AddTestRun("remap_yaml reload, fails")
-tr.Processes.Default.Env = tm.Env
-tr.Processes.Default.Command = 'sleep 2; traffic_ctl config reload'
+tr = Test.AddConfigReload(tm, expect="fail", expect_tasks=["remap.yaml"],
delay_start=2, description="remap_yaml reload, fails")
tr = Test.AddTestRun("after first reload")
-await_config_reload = tr.Processes.Process('config_reload_failed', 'sleep 30')
-await_config_reload.Ready = When.FileContains(tm.Disk.diags_log.Name,
"configuration is invalid")
Review Comment:
Could this check stay in place?
##########
tests/gold_tests/tls/tls_sni_yaml_reload.test.py:
##########
@@ -84,8 +84,6 @@
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stdout = Testers.ExcludesExpression("Could Not
Connect", "Verify curl could successfully connect")
tr.Processes.Default.Streams.stderr =
Testers.IncludesExpression(f"CN={sni_domain}", f"Verify curl used the
{sni_domain} SNI")
-ts.Disk.diags_log.Content = Testers.IncludesExpression(
- "SSL negotiation finished successfully", "Verify that the TLS handshake
was successful")
Review Comment:
Was this check removed on purpose?
##########
src/iocore/net/SSLClientCoordinator.cc:
##########
@@ -37,8 +37,8 @@ SSLClientCoordinator::reconfigure(ConfigContext reconf_ctx)
// The SSLConfig owns the client cert context storage and the SNIConfig will
load
// into it.
SSLConfig::reconfigure(reconf_ctx.add_dependent_ctx("SSLConfig"));
- SNIConfig::reconfigure(reconf_ctx.add_dependent_ctx("SNIConfig"));
-
SSLCertificateConfig::reconfigure(reconf_ctx.add_dependent_ctx("SSLCertificateConfig"));
+ SNIConfig::reconfigure(reconf_ctx.add_dependent_ctx("SNIConfig",
ts::filename::SNI));
+
SSLCertificateConfig::reconfigure(reconf_ctx.add_dependent_ctx("SSLCertificateConfig",
ts::filename::SSL_MULTICERT));
#if TS_USE_QUIC == 1
QUICCertConfig::reconfigure(reconf_ctx.add_dependent_ctx("QUICCertConfig"));
Review Comment:
should this also get `ts::filename::SSL_MULTICERT`?
##########
tests/gold_tests/tls/ssl_multicert_loader.test.py:
##########
@@ -78,19 +78,13 @@
tr2.Processes.Default.Env = ts.Env
tr2.Processes.Default.ReturnCode = 0
-tr2reload = Test.AddTestRun("Reload config")
-tr2reload.StillRunningAfter = ts
+tr2reload = Test.AddConfigReload(ts, expect="fail",
expect_tasks=["ssl_multicert.yaml"], description="Reload config")
tr2reload.StillRunningAfter = server
-tr2reload.Processes.Default.Command = 'traffic_ctl config reload'
-tr2reload.Processes.Default.Env = ts.Env
-tr2reload.Processes.Default.ReturnCode = 0
-ts.Disk.diags_log.Content = Testers.ContainsExpression('ERROR: ', 'ERROR')
# Reload of ssl_multicert.yaml should fail, BUT the old config structure
# should be in place to successfully answer for the test domain
tr3 = Test.AddTestRun("Make request again for $sni_domain")
-# Wait for the reload to complete
-tr3.Processes.Default.StartBefore(server2,
ready=When.FileContains(ts.Disk.diags_log.Name, 'failed to load certificate ',
1))
Review Comment:
Was this check removed on purpose?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
