diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2022-01-05 10:46:49 -0500 |
|---|---|---|
| committer | Daniel J Walsh <dwalsh@redhat.com> | 2022-01-05 10:46:53 -0500 |
| commit | 64df41755a26c62f7bb55bd1b28ef7efd814f703 (patch) | |
| tree | 146cdd10a9c3c4e28eb19ee3772e30670e7fc7e4 | |
| parent | 6902d9d9093e1d977ba733a182969bea3489dfbe (diff) | |
| download | podman-64df41755a26c62f7bb55bd1b28ef7efd814f703.tar.gz podman-64df41755a26c62f7bb55bd1b28ef7efd814f703.tar.bz2 podman-64df41755a26c62f7bb55bd1b28ef7efd814f703.zip | |
Change Tests to ignore missing containers when removing --all
Fixes: https://github.com/containers/podman/issues/12740
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
| -rw-r--r-- | test/system/180-blkio.bats | 2 | ||||
| -rw-r--r-- | test/system/helpers.bash | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/test/system/180-blkio.bats b/test/system/180-blkio.bats index 68449681a..7999c9ec5 100644 --- a/test/system/180-blkio.bats +++ b/test/system/180-blkio.bats @@ -8,7 +8,7 @@ load helpers function teardown() { lofile=${PODMAN_TMPDIR}/disk.img if [ -f ${lofile} ]; then - run_podman '?' rm -t 0 --all --force + run_podman '?' rm -t 0 --all --force --ignore while read path dev; do if [[ "$path" == "$lofile" ]]; then diff --git a/test/system/helpers.bash b/test/system/helpers.bash index 415c9010e..8f6033309 100644 --- a/test/system/helpers.bash +++ b/test/system/helpers.bash @@ -56,7 +56,7 @@ fi # Setup helper: establish a test environment with exactly the images needed function basic_setup() { # Clean up all containers - run_podman rm -t 0 --all --force + run_podman rm -t 0 --all --force --ignore # ...including external (buildah) ones run_podman ps --all --external --format '{{.ID}} {{.Names}}' @@ -109,8 +109,8 @@ function basic_setup() { # Basic teardown: remove all pods and containers function basic_teardown() { echo "# [teardown]" >&2 - run_podman '?' pod rm -t 0 --all --force - run_podman '?' rm -t 0 --all --force + run_podman '?' pod rm -t 0 --all --force --ignore + run_podman '?' rm -t 0 --all --force --ignore command rm -rf $PODMAN_TMPDIR } |