test: run the custom check hooks before common checks

since we delete the guest journals as part of the save_journal() step in
check_result_common(), making journal inaccessible from the custom check
hooks.
This commit is contained in:
Frantisek Sumsal
2022-06-17 17:28:13 +02:00
parent 4b9a0c3aeb
commit 35d2d2e61c
+8 -8
View File
@@ -1502,10 +1502,7 @@ check_result_nspawn() {
local workspace="${1:?}"
local ret
check_result_common "${workspace}"
ret=$?
# Run additional test-specific checks if defined by check_result_nspawn_hook()
# Run a test-specific checks if defined by check_result_nspawn_hook()
if declare -F check_result_nspawn_hook >/dev/null; then
if ! check_result_nspawn_hook "${workspace}"; then
derror "check_result_nspawn_hook() returned with EC > 0"
@@ -1513,6 +1510,9 @@ check_result_nspawn() {
fi
fi
check_result_common "${workspace}"
ret=$?
_umount_dir "${initdir:?}"
return $ret
@@ -1523,10 +1523,7 @@ check_result_qemu() {
local ret
mount_initdir
check_result_common "${initdir:?}"
ret=$?
# Run additional test-specific checks if defined by check_result_qemu_hook()
# Run a test-specific checks if defined by check_result_qemu_hook()
if declare -F check_result_qemu_hook >/dev/null; then
if ! check_result_qemu_hook "${initdir:?}"; then
derror "check_result_qemu_hook() returned with EC > 0"
@@ -1534,6 +1531,9 @@ check_result_qemu() {
fi
fi
check_result_common "${initdir:?}"
ret=$?
_umount_dir "${initdir:?}"
return $ret