use dmsetup remove instead of luksClose

test 1dfsddfddfsddffsddfds Signed-off-by: flouthoc <flouthoc.git@gmail.com>
containers · Feb 14, 2025 · 5d1e8f1 · 5d1e8f1
1 parent e8a8c8b
commit 5d1e8f1
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 2 deletions.
diff --git a/internal/mkcw/embed/entrypoint_amd64.gz b/internal/mkcw/embed/entrypoint_amd64.gz
diff --git a/tests/helpers.bash b/tests/helpers.bash
@@ -301,10 +301,35 @@ function rm() {
 #################
 #
 function run_with_log() {
+    local expected_rc=0
     local cmd="$*"
+    case "$1" in
+        [0-9])           expected_rc=$1; shift;;
+        [1-9][0-9])      expected_rc=$1; shift;;
+        [12][0-9][0-9])  expected_rc=$1; shift;;
+        '?')             expected_rc=  ; shift;;  # ignore exit code
+    esac
     echo "$_LOG_PROMPT $cmd"
-    run -0 "$@"
+    run "$@"
     echo "$output"
+    if [ "$status" -ne 0 ]; then
+        echo -n "[ rc=$status ";
+        if [ -n "$expected_rc" ]; then
+            if [ "$status" -eq "$expected_rc" ]; then
+                echo -n "(expected) ";
+            else
+                echo -n "(** EXPECTED $expected_rc **) ";
+            fi
+        fi
+        echo "]"
+    fi
+    if [ -n "$expected_rc" ]; then
+        if [ "$status" -eq "$expected_rc" ]; then
+            return
+        else
+            die "exit code is $status; expected $expected_rc"
+        fi
+    fi
 }
 
 #################

diff --git a/tests/mkcw.bats b/tests/mkcw.bats
@@ -42,7 +42,8 @@ function mkcw_check_image() {
   fi
 
   # Clean up.
-  run_with_log umount -f -l "$TEST_SCRATCH_DIR"/mount
+  run_with_log umount -f "$TEST_SCRATCH_DIR"/mount
+  run_with_log sleep 1
   run_with_log cryptsetup luksClose "$uuid"
   run_buildah umount "$ctrID"
 }