opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-05-22 09:36:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12750 from rhatdan/error

Browse Source 
Change Tests to ignore missing containers when removing --all
This commit is contained in:
OpenShift Merge Robot
2022-01-05 18:10:37 +01:00
committed by GitHub
parent 50e156b605 64df41755a
commit d67f178563
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/system/180-blkio.bats
View File

@ -8,7 +8,7 @@ load helpers
function teardown() { function teardown() {
lofile=${PODMAN_TMPDIR}/disk.img lofile=${PODMAN_TMPDIR}/disk.img
if [ -f ${lofile} ]; then if [ -f ${lofile} ]; then
run_podman '?' rm -t 0 --all --force run_podman '?' rm -t 0 --all --force --ignore
while read path dev; do while read path dev; do
if [[ "$path" == "$lofile" ]]; then if [[ "$path" == "$lofile" ]]; then

6
test/system/helpers.bash
View File

@ -56,7 +56,7 @@ fi
# Setup helper: establish a test environment with exactly the images needed # Setup helper: establish a test environment with exactly the images needed
function basic_setup() { function basic_setup() {
# Clean up all containers # Clean up all containers
run_podman rm -t 0 --all --force run_podman rm -t 0 --all --force --ignore
# ...including external (buildah) ones # ...including external (buildah) ones
run_podman ps --all --external --format '{{.ID}} {{.Names}}' run_podman ps --all --external --format '{{.ID}} {{.Names}}'
@ -109,8 +109,8 @@ function basic_setup() {
# Basic teardown: remove all pods and containers # Basic teardown: remove all pods and containers
function basic_teardown() { function basic_teardown() {
echo "# [teardown]" >&2 echo "# [teardown]" >&2
run_podman '?' pod rm -t 0 --all --force run_podman '?' pod rm -t 0 --all --force --ignore
run_podman '?' rm -t 0 --all --force run_podman '?' rm -t 0 --all --force --ignore
command rm -rf $PODMAN_TMPDIR command rm -rf $PODMAN_TMPDIR
} }