rpms/kexec-tools
7
0
Fork 0
Code Issues Pull Requests Releases Activity

selftest: run-test.sh: wait for subprocess instead of kill it

Browse Source 
When run tests with 2 VMs, for example nfs/ssh kdump tests, client VM will do the
crash and dump, server VM will do vmcore saving and if-vmcore-exists
check.

Previously, when client VM finishes running, run-test.sh will kill the lead background
process, and then check if server VM has outputted "TEST PASSED" or "TEST FAILED" string.
However it didn't wait for server VM to finish. As a result, the server VM's final
outputs are not collected and checked, leaving the test result as "TEST RESULT NOT FOUND"
sometimes.

For example, the following is the pstree status of $(jobs -p) before it
gets killed. We can see the server VM is still running:

run-test.sh,172455 /root/kexec-tools/tests/scripts/run-test.sh --console nfs-early-kdump
  └─run-test.sh,172457 /root/kexec-tools/tests/scripts/run-test.sh --console...
      └─timeout,172480 --foreground 10m /root/kexec-tools/tests/scripts/run-qemu...
          └─qemu-system-x86,172481 -enable-kvm -cpu host -nodefaults...
              ├─{qemu-system-x86},172489
              ├─{qemu-system-x86},172492
              ├─{qemu-system-x86},172493
              ├─{qemu-system-x86},172628
              └─{qemu-system-x86},172629

In this patch, we will wait for $(jobs -p) to finish, in order to get
the complete output of test results.

Signed-off-by: Tao Liu <ltao@redhat.com>
Acked-by: Coiby Xu <coxu@redhat.com>
This commit is contained in:
Tao Liu 2021-12-30 11:26:42 +08:00 committed by Coiby Xu
parent bb380a92fa
commit f4ab396574
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/scripts/run-test.sh
View File

@ -140,7 +140,7 @@ for test_case in $testcases; do
if [ $console -eq 1 ]; then if [ $console -eq 1 ]; then
run_test_sync $script | tee $(get_test_console_file $script) run_test_sync $script | tee $(get_test_console_file $script)
[ -n "$(jobs -p)" ] && kill $(jobs -p) [ -n "$(jobs -p)" ] && wait $(jobs -p)
else else
$(run_test_sync $script > $(get_test_console_file $script)) & $(run_test_sync $script > $(get_test_console_file $script)) &
watch_test_outputs $test_outputs watch_test_outputs $test_outputs