summaryrefslogtreecommitdiff
path: root/test/system/helpers.bash
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-10-20 07:25:35 -0400
committerGitHub <noreply@github.com>2020-10-20 07:25:35 -0400
commitf9450300b73e18890f7264bffca35b291aa3176e (patch)
tree1764522482b97b6fdf86c21e5d2505aa6e49b89c /test/system/helpers.bash
parente944544271d9e515bdfc7e364e3ddf372b0dd378 (diff)
parentb23d430516a20f0274c200c2d67bf0e1b05bff18 (diff)
downloadpodman-f9450300b73e18890f7264bffca35b291aa3176e.tar.gz
podman-f9450300b73e18890f7264bffca35b291aa3176e.tar.bz2
podman-f9450300b73e18890f7264bffca35b291aa3176e.zip
Merge pull request #8061 from edsantiago/bats
System tests: remove some misleading 'run's
Diffstat (limited to 'test/system/helpers.bash')
-rw-r--r--test/system/helpers.bash8
1 files changed, 8 insertions, 0 deletions
diff --git a/test/system/helpers.bash b/test/system/helpers.bash
index 4591c9015..73cf1e5b2 100644
--- a/test/system/helpers.bash
+++ b/test/system/helpers.bash
@@ -34,6 +34,14 @@ function basic_setup() {
# Clean up all containers
run_podman rm --all --force
+ # ...including external (buildah) ones
+ run_podman ps --all --external --format '{{.ID}} {{.Names}}'
+ for line in "${lines[@]}"; do
+ set $line
+ echo "# setup(): removing stray external container $1 ($2)" >&3
+ run_podman rm $1
+ done
+
# Clean up all images except those desired
found_needed_image=
run_podman images --all --format '{{.Repository}}:{{.Tag}} {{.ID}}'