diff options
| author | Ed Santiago <santiago@redhat.com> | 2021-11-09 08:36:29 -0700 |
|---|---|---|
| committer | Ed Santiago <santiago@redhat.com> | 2021-11-16 12:51:17 -0700 |
| commit | e367f46147e92b89a6d61d8d017853d46e76c8ca (patch) | |
| tree | 487eaa03276d01202eb2adffa712011e0ac49236 /test | |
| parent | 197ebe8b5e6c10db786ad22692536e395c911b87 (diff) | |
| download | podman-e367f46147e92b89a6d61d8d017853d46e76c8ca.tar.gz podman-e367f46147e92b89a6d61d8d017853d46e76c8ca.tar.bz2 podman-e367f46147e92b89a6d61d8d017853d46e76c8ca.zip | |
hack/bats: deal with new bin helpers
Some time in the last month, podman started to depend on a bunch
of external helper binaries: rootlessport, pause, catatonit.
System tests fail without these.
Update the hack/bats script to pass $CONTAINERS_HELPER_BINARIES_DIR
(set to ./bin); podman will then use locally-built helpers. (This
requires https://github.com/containers/common/pull/823 , which as
of this PR is not yet vendored into podman. There is no harm in
merging this while we wait.)
Also: if bats helper is invoked as root, run only once; i.e.,
skip the "rootless" step.
Also (piggybacked): the name of the podman pause image has
changed, from pause to podman-pause. Adjust that in our
teardown so we don't leave droppings.
Signed-off-by: Ed Santiago <santiago@redhat.com>
Diffstat (limited to 'test')
| -rw-r--r-- | test/system/700-play.bats | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/system/700-play.bats b/test/system/700-play.bats index c3e5e9354..b77d41920 100644 --- a/test/system/700-play.bats +++ b/test/system/700-play.bats @@ -11,7 +11,7 @@ function teardown() { run_podman rm -t 0 -f -a run_podman image list --format '{{.ID}} {{.Repository}}' while read id name; do - if [[ "$name" =~ /pause ]]; then + if [[ "$name" =~ /podman-pause ]]; then run_podman rmi $id fi done <<<"$output" |