tests/int/checkpoint: fix checks, add logs
1. When using `runc`, we should check `$status` and not `$?`.
2. Before exit code check, let's (try to) show errors from CRIU log.
@@ -58,9 +58,8 @@ function simple_cr() {
# restore from checkpoint
runc --criu "$CRIU" restore -d --work-path ./work-dir --console-socket $CONSOLE_SOCKET test_busybox
- ret=$?
cat ./work-dir/restore.log | grep -B 5 Error || true
- [ "$ret" -eq 0 ]
+ [ "$status" -eq 0 ]
# busybox should be back up and running
testcontainer test_busybox running
@@ -181,7 +180,9 @@ function simple_cr() {
# Killing the CRIU on the checkpoint side will let the container
# continue to run if the migration failed at some point.
__runc --criu "$CRIU" restore -d --work-path ./image-dir --image-path ./image-dir --lazy-pages test_busybox_restore <&60 >&51 2>&51
- [ $? -eq 0 ]
+ ret=$?
+ cat ./work-dir/restore.log | grep -B 5 Error || true
+ [ $ret -eq 0 ]
# busybox should be back up and running
testcontainer test_busybox_restore running
@@ -283,6 +284,7 @@ function simple_cr() {
# checkpoint the running container
runc --criu "$CRIU" checkpoint --work-path ./work-dir test_busybox
+ cat ./work-dir/dump.log | grep -B 5 Error || true
[ "$status" -eq 0 ]
! test -f ./work-dir/$tmplog1
test -f ./work-dir/$tmplog2
@@ -293,6 +295,7 @@ function simple_cr() {
test -f ./work-dir/$tmplog2 && unlink ./work-dir/$tmplog2
# restore from checkpoint
runc --criu "$CRIU" restore -d --work-path ./work-dir --console-socket $CONSOLE_SOCKET test_busybox
+ cat ./work-dir/restore.log | grep -B 5 Error || true
[ "$status" -eq 0 ]
! test -f ./work-dir/$tmplog1
test -f ./work-dir/$tmplog2
