diff options
| author | Ed Santiago <santiago@redhat.com> | 2020-10-19 07:59:02 -0600 |
|---|---|---|
| committer | Ed Santiago <santiago@redhat.com> | 2020-10-19 08:43:56 -0600 |
| commit | b23d430516a20f0274c200c2d67bf0e1b05bff18 (patch) | |
| tree | d34dfbcf3fdc58fa4d48e0857e0549965a73fb3c /test/system/helpers.bash | |
| parent | 7ffcab0854342844a44b2668bd9d98849bf935c8 (diff) | |
| download | podman-b23d430516a20f0274c200c2d67bf0e1b05bff18.tar.gz podman-b23d430516a20f0274c200c2d67bf0e1b05bff18.tar.bz2 podman-b23d430516a20f0274c200c2d67bf0e1b05bff18.zip | |
System tests: remove some misleading 'run's
The BATS 'run' directive is really quite obnoxious; for the
most part we really don't want to use it. Remove some uses
that snuck in last week, and remove one test (exists) that
can more naturally be piggybacked into an rm test.
While we're at it: in setup(), look for and delete stray
external (buildah) containers. This will be important if
any of the external-container tests fails; this way we
don't leave behind a state that causes subsequent tests
to fail.
Signed-off-by: Ed Santiago <santiago@redhat.com>
Diffstat (limited to 'test/system/helpers.bash')
| -rw-r--r-- | test/system/helpers.bash | 8 |
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}}' |