From 6fec50cf4ae83f514eff0a64513e43c63b3e20cc Mon Sep 17 00:00:00 2001 From: jinsaihang Date: Sat, 22 Mar 2025 11:30:31 +0800 Subject: [PATCH] fix some testcases Signed-off-by: jinsaihang --- .../test/test_xalarm_read_config_exception.sh | 16 +++++++++++----- ...t_xalarm_register_and_unregister_exception.sh | 8 +++++--- selftest/test/test_xalarm_restart_exception.sh | 6 ++++-- selftest/test/test_xalarm_send_message.sh | 13 +++++++++---- selftest/test/test_xalarm_upgrade_exception.sh | 7 +++++-- 5 files changed, 34 insertions(+), 16 deletions(-) diff --git a/selftest/test/test_xalarm_read_config_exception.sh b/selftest/test/test_xalarm_read_config_exception.sh index d31d53b..459c77a 100644 --- a/selftest/test/test_xalarm_read_config_exception.sh +++ b/selftest/test/test_xalarm_read_config_exception.sh @@ -12,7 +12,8 @@ set +e function pre_test() { cp /etc/sysSentry/xalarm.conf /etc/sysSentry/xalarm.conf.bak rm -f ./tmp_log - systemctl stop xalarmd.service + kill $(pgrep -w xalarmd) + sleep 1 } function do_test() { @@ -20,7 +21,7 @@ function do_test() { # 异常的alarm id 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 - systemctl start xalarmd.service + xalarmd & 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 @@ -41,7 +42,9 @@ function do_test() { rm -f /etc/sysSentry/xalarm.conf start_line=$(expr $(wc -l < /var/log/sysSentry/xalarm.log) + 1) echo -e "[no_filter]\nid_mask = 123" > /etc/sysSentry/xalarm.conf - systemctl restart xalarmd.service + kill $(pgrep -w xalarmd) + sleep 1 + xalarmd & 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 @@ -50,7 +53,9 @@ function do_test() { rm -f /etc/sysSentry/xalarm.conf start_line=$(expr $(wc -l < /var/log/sysSentry/xalarm.log) + 1) echo -e "[filter]\nid_mask_number = 123" > /etc/sysSentry/xalarm.conf - systemctl restart xalarmd.service + kill $(pgrep -w xalarmd) + sleep 1 + xalarmd & 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 @@ -62,7 +67,8 @@ function post_test() { cat ./tmp_log rm -f /etc/sysSentry/xalarm.conf ./tmp_log cp /etc/sysSentry/xalarm.conf.bak /etc/sysSentry/xalarm.conf - systemctl stop xalarmd.service + kill $(pgrep -w xalarmd) + sleep 1 } run_testcase diff --git a/selftest/test/test_xalarm_register_and_unregister_exception.sh b/selftest/test/test_xalarm_register_and_unregister_exception.sh index 5e90995..b3c54e1 100644 --- a/selftest/test/test_xalarm_register_and_unregister_exception.sh +++ b/selftest/test/test_xalarm_register_and_unregister_exception.sh @@ -13,7 +13,7 @@ function pre_test() { rm -rf ./checklog test/xalarm/unreg_demo test/xalarm/send_demo test/xalarm/reg_demo gcc test/xalarm/reg_demo.c -o test/xalarm/reg_demo -lxalarm gcc test/xalarm/unreg_demo.c -o test/xalarm/unreg_demo -lxalarm - systemctl start xalarmd.service + xalarmd & } function do_test() { @@ -33,10 +33,12 @@ function do_test() { } function post_test() { - kill -9 $(pgrep -w unreg_demo) + kill $(pgrep -w unreg_demo) + sleep 1 cat ./checklog rm -rf ./checklog test/xalarm/unreg_demo test/xalarm/reg_demo - systemctl stop xalarmd.service + kill $(pgrep -w xalarmd) + sleep 1 } run_testcase diff --git a/selftest/test/test_xalarm_restart_exception.sh b/selftest/test/test_xalarm_restart_exception.sh index cc24435..236e4c3 100644 --- a/selftest/test/test_xalarm_restart_exception.sh +++ b/selftest/test/test_xalarm_restart_exception.sh @@ -11,7 +11,8 @@ set +e function pre_test() { rm -f ./tmp_log - systemctl stop xalarmd + kill $(pgrep -w xalarmd) + sleep 1 } function do_test() { @@ -21,7 +22,7 @@ function do_test() { /usr/bin/xalarmd end_line=$(wc -l < /var/log/sysSentry/xalarm.log) - process_num=$(ps -ef | grep xalarmd | grep -v grep | wc -l) + process_num=$(ps -ef | grep xalarmd | grep -v grep | grep -v defunct | wc -l) echo "xalarm process num is $process_num" >> ./tmp_log expect_eq $process_num 1 "check xalarmd can launch multiple times" @@ -35,6 +36,7 @@ function do_test() { function post_test() { rm -f ./tmp_log kill $(pgrep -w xalarmd) + sleep 1 } run_testcase diff --git a/selftest/test/test_xalarm_send_message.sh b/selftest/test/test_xalarm_send_message.sh index 310fa53..6aea942 100644 --- a/selftest/test/test_xalarm_send_message.sh +++ b/selftest/test/test_xalarm_send_message.sh @@ -13,7 +13,9 @@ function pre_test() { rm -rf ./checklog ./tmp_log test/xalarm/send_demo test/xalarm/reg_demo gcc test/xalarm/send_demo.c -o test/xalarm/send_demo -lxalarm gcc test/xalarm/reg_demo.c -o test/xalarm/reg_demo -lxalarm - systemctl start xalarmd.service + kill $(pgrep -w xalarmd) + sleep 1 + xalarmd & } function do_test() { @@ -70,7 +72,8 @@ function do_test() { expect_eq $? 0 "check unregister xalarm" # 停止xalarmd服务后发消息 - systemctl stop xalarmd.service + kill $(pgrep -w xalarmd) + sleep 1 ./test/xalarm/send_demo 1001 1 2 "cpu usage high warning" >> checklog 2>&1 & wait_cmd_ok "grep \"xalarm_Report: sendto failed errno: 2\" ./checklog" 1 3 @@ -78,10 +81,12 @@ function do_test() { } function post_test() { - kill -9 $(pgrep -w reg_demo) + kill $(pgrep -w reg_demo) + sleep 1 cat ./checklog rm -rf ./checklog ./tmp_log test/xalarm/send_demo test/xalarm/reg_demo - systemctl stop xalarmd.service + kill $(pgrep -w xalarmd) + sleep 1 } run_testcase diff --git a/selftest/test/test_xalarm_upgrade_exception.sh b/selftest/test/test_xalarm_upgrade_exception.sh index 61aa911..2ea4da1 100644 --- a/selftest/test/test_xalarm_upgrade_exception.sh +++ b/selftest/test/test_xalarm_upgrade_exception.sh @@ -13,11 +13,12 @@ function pre_test() { rm -rf ./checklog test/xalarm/upgrade_demo test/xalarm/send_demo gcc test/xalarm/upgrade_demo.c -o test/xalarm/upgrade_demo -lxalarm gcc test/xalarm/send_demo.c -o test/xalarm/send_demo -lxalarm - systemctl start xalarmd.service + xalarmd & } function do_test() { ./test/xalarm/upgrade_demo 4 0 1001 1002 1003 1004 >> checklog 2>&1 & + sleep 2 ./test/xalarm/send_demo 1004 1 2 "cpu usage high warning" wait_cmd_ok "grep \"id:1004\" ./checklog" 1 3 expect_eq $? 0 "check upgrade take effect" @@ -39,9 +40,11 @@ function do_test() { function post_test() { kill -9 $(pgrep -w upgrade_demo) + sleep 1 cat ./checklog rm -rf ./checklog test/xalarm/upgrade_demo test/xalarm/send_demo - systemctl stop xalarmd.service + kill $(pgrep -w xalarmd) + sleep 1 } run_testcase -- Gitee