You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by bn...@apache.org on 2022/06/08 00:58:08 UTC
[trafficserver] branch master updated: remap_reload test: Spacing out file modification and reload (#8889)
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 69ebe48fe remap_reload test: Spacing out file modification and reload (#8889)
69ebe48fe is described below
commit 69ebe48fe7e9c927e6b876ca4b7c7a60e99868cd
Author: Brian Neradt <br...@gmail.com>
AuthorDate: Tue Jun 7 19:58:01 2022 -0500
remap_reload test: Spacing out file modification and reload (#8889)
---
tests/gold_tests/remap/remap_reload.test.py | 67 ++++++++++++++++-------------
1 file changed, 37 insertions(+), 30 deletions(-)
diff --git a/tests/gold_tests/remap/remap_reload.test.py b/tests/gold_tests/remap/remap_reload.test.py
index fedf90d4e..6660dcc58 100644
--- a/tests/gold_tests/remap/remap_reload.test.py
+++ b/tests/gold_tests/remap/remap_reload.test.py
@@ -42,46 +42,53 @@ tm.Disk.records_config.update({
'proxy.config.dns.nameservers': f"127.0.0.1:{nameserver.Variables.Port}", 'proxy.config.dns.resolv_conf': 'NULL'
})
-tr_1 = Test.AddTestRun("verify load")
-tr_1.Processes.Default.StartBefore(pv)
-tr_1.Processes.Default.StartBefore(nameserver)
-tr_1.Processes.Default.StartBefore(tm)
-tr_1.AddVerifierClientProcess("client", replay_file_1, http_ports=[tm.Variables.port])
+tr = Test.AddTestRun("verify load")
+tr.Processes.Default.StartBefore(pv)
+tr.Processes.Default.StartBefore(nameserver)
+tr.Processes.Default.StartBefore(tm)
+tr.AddVerifierClientProcess("client", replay_file_1, http_ports=[tm.Variables.port])
-tr_2 = Test.AddTestRun("reload-fail")
-tr_2.Processes.Default.Command = 'traffic_ctl config reload'
-tr_2.Processes.Default.Env = tm.Env
-tr_2.Disk.File(remap_cfg_path).WriteOn("")
-tr_2.Disk.File(remap_cfg_path, typename="ats:config").AddLines([
+tr = Test.AddTestRun("Change remap.config to have only two lines")
+tr.Processes.Default.Env = tm.Env
+tr.Processes.Default.Command = 'echo "Change remap.config, two lines"'
+tr.Disk.File(remap_cfg_path).WriteOn("")
+tr.Disk.File(remap_cfg_path, typename="ats:config").AddLines([
f"map http://alpha.ex http://alpha.ex:{pv_port}", f"map http://bravo.ex http://bravo.ex:{pv_port}"
])
+tr = Test.AddTestRun("remap_config reload, fails")
+tr.Processes.Default.Env = tm.Env
+tr.Processes.Default.Command = 'sleep 2; traffic_ctl config reload'
-tr_3 = Test.AddTestRun("after first reload")
-await_config_reload = tr_3.Processes.Process('config_reload_failed', 'sleep 30')
+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")
-tr_3.AddVerifierClientProcess("client_2", replay_file_2, http_ports=[tm.Variables.port])
-tr_3.Processes.Default.StartBefore(await_config_reload)
+tr.AddVerifierClientProcess("client_2", replay_file_2, http_ports=[tm.Variables.port])
+tr.Processes.Default.StartBefore(await_config_reload)
-tr_4 = Test.AddTestRun("reload-succeed")
-tr_4.Processes.Default.Command = 'traffic_ctl config reload'
-tr_4.Processes.Default.Env = tm.Env
-tr_4.Disk.File(remap_cfg_path).WriteOn("")
-tr_4.Disk.File(remap_cfg_path,
- typename="ats:config").AddLines([f"map http://echo.ex http://echo.ex:{pv_port}",
- f"map http://foxtrot.ex http://foxtrot.ex:{pv_port}",
- f"map http://golf.ex http://golf.ex:{pv_port}",
- f"map http://hotel.ex http://hotel.ex:{pv_port}",
- f"map http://india.ex http://india.ex:{pv_port}"])
+tr = Test.AddTestRun("Change remap.config to have more than three lines")
+tr.Processes.Default.Env = tm.Env
+tr.Processes.Default.Command = 'echo "Change remap.config, more than three lines"'
+tr.Disk.File(remap_cfg_path).WriteOn("")
+tr.Disk.File(remap_cfg_path,
+ typename="ats:config").AddLines([f"map http://echo.ex http://echo.ex:{pv_port}",
+ f"map http://foxtrot.ex http://foxtrot.ex:{pv_port}",
+ f"map http://golf.ex http://golf.ex:{pv_port}",
+ f"map http://hotel.ex http://hotel.ex:{pv_port}",
+ f"map http://india.ex http://india.ex:{pv_port}"])
-tr_5 = Test.AddTestRun("post update charlie")
-await_config_reload = tr_5.Processes.Process('config_reload_succeeded', 'sleep 30')
+tr = Test.AddTestRun("remap_config reload, succeeds")
+tr.Processes.Default.Env = tm.Env
+tr.Processes.Default.Command = 'sleep 2; traffic_ctl config reload'
+
+tr = Test.AddTestRun("post update charlie")
+await_config_reload = tr.Processes.Process('config_reload_succeeded', 'sleep 30')
await_config_reload.Ready = When.FileContains(
tm.Disk.diags_log.Name,
"remap.config finished loading",
2)
-tr_5.Processes.Default.StartBefore(await_config_reload)
-tr_5.AddVerifierClientProcess("client_3", replay_file_3, http_ports=[tm.Variables.port])
+tr.Processes.Default.StartBefore(await_config_reload)
+tr.AddVerifierClientProcess("client_3", replay_file_3, http_ports=[tm.Variables.port])
-tr_6 = Test.AddTestRun("post update golf")
-tr_6.AddVerifierClientProcess("client_4", replay_file_4, http_ports=[tm.Variables.port])
+tr = Test.AddTestRun("post update golf")
+tr.AddVerifierClientProcess("client_4", replay_file_4, http_ports=[tm.Variables.port])