tests: lxc-test-checkpoint-restore: use trap to do cleanup

This test will fail on Jammy 5.15, and because of the "set -e" it
will never go through the lxc-stop and lxc-destroy code in the end
of this script. Thus the lxc-test-criu container will not be removed.

Compose a cleanup() and use TRAP to solve this problem.

Signed-off-by: Po-Hsu Lin <po-hsu.lin@canonical.com>

diff --git a/src/tests/lxc-test-checkpoint-restore b/src/tests/lxc-test-checkpoint-restore
index 5aee0a427d7a6af7ba837c714e571f82ba4ca159..9498c126e834a8e6a72a390ded27a4894f63cbff 100755 (executable)
--- a/src/tests/lxc-test-checkpoint-restore
+++ b/src/tests/lxc-test-checkpoint-restore
@@ -10,6 +10,12 @@ FAIL() {
        exit 1
 }
 
+cleanup() {
+       set +e
+       lxc-stop -n $name -k
+       lxc-destroy -f -n $name
+}
+
 if [ "$(id -u)" != "0" ]; then
        echo "ERROR: Must run as root."
        exit 1
@@ -27,6 +33,7 @@ if verlte "$criu_version" "1.3.1"; then
 fi
 
 name=lxc-test-criu
+trap cleanup EXIT HUP INT TERM
 lxc-create -t busybox -n $name || FAIL "creating container"
 
 cat >> "$(lxc-config lxc.lxcpath)/$name/config" <<EOF
@@ -47,6 +54,3 @@ sleep 5s
 lxc-checkpoint -n $name -v -s -D /tmp/checkpoint || FAIL "failed checkpointing"
 lxc-wait -n $name -s STOPPED
 lxc-checkpoint -n $name -v -r -D /tmp/checkpoint || FAIL "failed restoring"
-
-lxc-stop -n $name -k
-lxc-destroy -f -n $name