summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2022-01-05 18:10:37 +0100
committerGitHub <noreply@github.com>2022-01-05 18:10:37 +0100
commitd67f178563a8948ddc625f99f27be84a27b2cb50 (patch)
tree5b8363bdd1ce79c9e3aa770eea444835f2bf8a6e
parent50e156b60536017fc1841ef6b875565cb1a08a4e (diff)
parent64df41755a26c62f7bb55bd1b28ef7efd814f703 (diff)
downloadpodman-d67f178563a8948ddc625f99f27be84a27b2cb50.tar.gz
podman-d67f178563a8948ddc625f99f27be84a27b2cb50.tar.bz2
podman-d67f178563a8948ddc625f99f27be84a27b2cb50.zip
Merge pull request #12750 from rhatdan/error
Change Tests to ignore missing containers when removing --all
-rw-r--r--test/system/180-blkio.bats2
-rw-r--r--test/system/helpers.bash6
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 958a0e87c..dcf7cf0a7 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
}