tests: Remove erroneous --rm run options

Signed-off-by: Alberto Faria <[email protected]>
containers · Apr 24, 2024 · 164322f · 164322f
1 parent 8fd40d1
commit 164322f
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 20 deletions.
diff --git a/tests/env.sh b/tests/env.sh
@@ -411,7 +411,11 @@ run)
                     xargs --no-run-if-empty ${engine_cmd[*]} stop --time 0 \
                     >/dev/null 2>&1
                 ${engine_cmd[*]} ps --filter label=$label --format '{{.Names}}' --all |
-                    xargs --no-run-if-empty ${engine_cmd[*]} rm --force
+                    xargs --no-run-if-empty ${engine_cmd[*]} rm --force \
+                    >/dev/null 2>&1 \
+                    || true  # avoid 'removal already in progress' docker errors
+                ${engine_cmd[*]} ps --filter label=$label --format '{{.Names}}' --all |
+                    xargs --no-run-if-empty false  # fail if containers still exist
                 sudo rm -fr $label.temp $label.util
                 "
 

diff --git a/tests/t/cloud-init.sh b/tests/t/cloud-init.sh
@@ -15,11 +15,7 @@ EOF
 cat >"$TEMP_DIR/meta-data" <<EOF
 EOF
 
-__engine run \
-    --rm --detach \
-    --name cloud-init \
-    "$image" \
-    --cloud-init "$TEMP_DIR"
+__engine run --detach --name cloud-init "$image" --cloud-init "$TEMP_DIR"
 
 __test() {
     __engine exec cloud-init --as "$user" "cmp $home/file <<< hello"

diff --git a/tests/t/hostname.sh b/tests/t/hostname.sh
@@ -7,13 +7,7 @@ for os in fedora coreos; do
 
     # default hostname
 
-    id=$(
-        __engine run \
-            --rm --detach \
-            --name "hostname-$os-default" \
-            "$image" \
-            ""
-        )
+    id=$( __engine run --detach --name "hostname-$os-default" "$image" "" )
 
     __test() {
         __engine exec "hostname-$os-default" --as "$user" \
@@ -25,11 +19,12 @@ for os in fedora coreos; do
     __test
 
     __engine stop --time 0 "hostname-$os-default"
+    __engine rm "hostname-$os-default"
 
     # custom hostname
 
     __engine run \
-        --rm --detach \
+        --detach \
         --name "hostname-$os-custom" \
         --hostname my-test-vm \
         "$image" \
@@ -45,5 +40,6 @@ for os in fedora coreos; do
     __test
 
     __engine stop --time 0 "hostname-$os-custom"
+    __engine rm "hostname-$os-custom"
 
 done
diff --git a/tests/t/ignition.sh b/tests/t/ignition.sh
@@ -24,11 +24,7 @@ cat >"$TEMP_DIR/config.ign" <<EOF
 }
 EOF
 
-__engine run \
-    --rm --detach \
-    --name ignition \
-    "$image" \
-    --ignition "$TEMP_DIR/config.ign"
+__engine run --detach --name ignition "$image" --ignition "$TEMP_DIR/config.ign"
 
 __test() {
     __engine exec ignition --as "$user" "cmp $home/file <<< hello"

diff --git a/tests/t/mount.sh b/tests/t/mount.sh
@@ -9,7 +9,7 @@ for os in fedora coreos; do
     echo hello > "$TEMP_DIR/file"
 
     __engine run \
-        --rm --detach \
+        --detach \
         --name "mount-$os" \
         --volume "$TEMP_DIR/file:$home/file:z" \
         --volume "$TEMP_DIR:$home/dir:z" \
@@ -43,5 +43,6 @@ for os in fedora coreos; do
     __test
 
     __engine stop --time 0 "mount-$os"
+    __engine rm "mount-$os"
 
 done