From bca5f24c9938878610be032b480afb0dd18821b6 Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Wed, 9 Sep 2020 17:35:10 -0700 Subject: [PATCH] tests/int/checkpoint.bats: fix showing logs on fail This fixes the following issue with the test: not ok 12 checkpoint --lazy-pages and restore # (in test file tests/integration/checkpoint.bats, line 202) # `[ $ret -eq 0 ]' failed ... # grep: ./work-dir/restore.log: No such file or directory One might think that `--work-path ./image-dir` is a mistake, but it's not, since `criu lazy-pages -D ./image-dir` creates a socket in ./image-dir, and then `criu restore --lazy-pages` expects a socket in the workdir. Fixes: e232a71a3d8 Signed-off-by: Kir Kolyshkin --- tests/integration/checkpoint.bats | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/integration/checkpoint.bats b/tests/integration/checkpoint.bats index c7debd6cb..ca34adb1c 100644 --- a/tests/integration/checkpoint.bats +++ b/tests/integration/checkpoint.bats @@ -198,7 +198,7 @@ function simple_cr() { # continue to run if the migration failed at some point. ret=0 __runc --criu "$CRIU" restore -d --work-path ./image-dir --image-path ./image-dir --lazy-pages test_busybox_restore <&${in_r} >&${out_w} 2>&${out_w} || ret=$? - grep -B 5 Error ./work-dir/restore.log || true + grep -B 5 Error ./image-dir/restore.log || true [ $ret -eq 0 ] # busybox should be back up and running