diff --git a/selftest/test/test_xalarm_read_config_exception.sh b/selftest/test/test_xalarm_read_config_exception.sh index 459c77ae41a38746d5100d82229775a99991aa6f..bbb5b45fbd2eca2aa2622427ab47f3b77f35d266 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 b3c54e160d3966f8876ba0cea298b606406830a4..e860a3935be7825057ed0b21e3305c07abb06120 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 6aea942408f4f73ee23c008a723124adbca5ef05..7420e96485cf78b4fb490de3083088a273377e37 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 2ea4da1757d8fc1470f6962101e3a3c78ee8d44f..49da80d6ab530867e5d5153eca749f4a8ce310b4 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() {