From c8c0a73cebceaa2cb4890bb07f4980e930150dbd Mon Sep 17 00:00:00 2001 From: jinsaihang Date: Sat, 22 Mar 2025 14:54:24 +0800 Subject: [PATCH] add sleep time for xalarmd Signed-off-by: jinsaihang --- selftest/test/test_xalarm_read_config_exception.sh | 3 +++ selftest/test/test_xalarm_register_and_unregister_exception.sh | 1 + selftest/test/test_xalarm_send_message.sh | 3 ++- selftest/test/test_xalarm_upgrade_exception.sh | 1 + 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/selftest/test/test_xalarm_read_config_exception.sh b/selftest/test/test_xalarm_read_config_exception.sh index 459c77a..bbb5b45 100644 --- a/selftest/test/test_xalarm_read_config_exception.sh +++ b/selftest/test/test_xalarm_read_config_exception.sh @@ -22,6 +22,7 @@ function do_test() { start_line=$(expr $(wc -l < /var/log/sysSentry/xalarm.log) + 1) echo -e "[filter]\nid_mask = 999,9999,aaa,test-and-run,7869-2431" > /etc/sysSentry/xalarm.conf xalarmd & + sleep 1 end_line=$(wc -l < /var/log/sysSentry/xalarm.log) sed -n "${start_line}, ${end_line}p" /var/log/sysSentry/xalarm.log >> ./tmp_log wait_cmd_ok "grep \"invalid alarm id 999, ignored\" ./tmp_log" 1 3 @@ -45,6 +46,7 @@ function do_test() { kill $(pgrep -w xalarmd) sleep 1 xalarmd & + sleep 1 end_line=$(wc -l < /var/log/sysSentry/xalarm.log) sed -n "${start_line}, ${end_line}p" /var/log/sysSentry/xalarm.log >> ./tmp_log wait_cmd_ok "grep \"no filter conf\" ./tmp_log" 1 3 @@ -56,6 +58,7 @@ function do_test() { kill $(pgrep -w xalarmd) sleep 1 xalarmd & + sleep 1 end_line=$(wc -l < /var/log/sysSentry/xalarm.log) sed -n "${start_line}, ${end_line}p" /var/log/sysSentry/xalarm.log >> ./tmp_log wait_cmd_ok "grep \"no id_mask conf\" ./tmp_log" 1 3 diff --git a/selftest/test/test_xalarm_register_and_unregister_exception.sh b/selftest/test/test_xalarm_register_and_unregister_exception.sh index b3c54e1..e860a39 100644 --- a/selftest/test/test_xalarm_register_and_unregister_exception.sh +++ b/selftest/test/test_xalarm_register_and_unregister_exception.sh @@ -14,6 +14,7 @@ function pre_test() { gcc test/xalarm/reg_demo.c -o test/xalarm/reg_demo -lxalarm gcc test/xalarm/unreg_demo.c -o test/xalarm/unreg_demo -lxalarm xalarmd & + sleep 1 } function do_test() { diff --git a/selftest/test/test_xalarm_send_message.sh b/selftest/test/test_xalarm_send_message.sh index 6aea942..7420e96 100644 --- a/selftest/test/test_xalarm_send_message.sh +++ b/selftest/test/test_xalarm_send_message.sh @@ -16,6 +16,7 @@ function pre_test() { kill $(pgrep -w xalarmd) sleep 1 xalarmd & + sleep 1 } function do_test() { @@ -81,7 +82,7 @@ function do_test() { } function post_test() { - kill $(pgrep -w reg_demo) + kill $(pgrep -w xalarmd) sleep 1 cat ./checklog rm -rf ./checklog ./tmp_log test/xalarm/send_demo test/xalarm/reg_demo diff --git a/selftest/test/test_xalarm_upgrade_exception.sh b/selftest/test/test_xalarm_upgrade_exception.sh index 2ea4da1..49da80d 100644 --- a/selftest/test/test_xalarm_upgrade_exception.sh +++ b/selftest/test/test_xalarm_upgrade_exception.sh @@ -14,6 +14,7 @@ function pre_test() { gcc test/xalarm/upgrade_demo.c -o test/xalarm/upgrade_demo -lxalarm gcc test/xalarm/send_demo.c -o test/xalarm/send_demo -lxalarm xalarmd & + sleep 1 } function do_test() { -- Gitee