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

hack/bats: deal with new bin helpers

Browse Source 
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>
This commit is contained in:
Ed Santiago
2021-11-09 08:36:29 -07:00
parent 197ebe8b5e
commit e367f46147
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
hack/bats
View File

@ -93,19 +93,25 @@ done
rc=0 rc=0
# As of 2021-11 podman has a bunch of external helper binaries
if [[ -z "$CONTAINERS_HELPER_BINARY_DIR" ]]; then
export CONTAINERS_HELPER_BINARY_DIR=$(pwd)/bin
fi
# Root # Root
if [ -z "$ROOTLESS_ONLY" ]; then if [ -z "$ROOTLESS_ONLY" ]; then
echo "# bats ${bats_filter[@]} $TESTS" echo "# bats ${bats_filter[@]} $TESTS"
sudo --preserve-env=PODMAN \ sudo --preserve-env=PODMAN \
--preserve-env=PODMAN_TEST_DEBUG \ --preserve-env=PODMAN_TEST_DEBUG \
--preserve-env=OCI_RUNTIME \ --preserve-env=OCI_RUNTIME \
--preserve-env=CONTAINERS_HELPER_BINARY_DIR \
bats "${bats_opts[@]}" "${bats_filter[@]}" $TESTS bats "${bats_opts[@]}" "${bats_filter[@]}" $TESTS
rc=$? rc=$?
fi fi
# Rootless # Rootless. (Only if we're not already root)
echo "--------------------------------------------------" if [[ -z "$ROOT_ONLY" && "$(id -u)" != 0 ]]; then
if [ -z "$ROOT_ONLY" ]; then echo "--------------------------------------------------"
echo "\$ bats ${bats_filter[@]} $TESTS" echo "\$ bats ${bats_filter[@]} $TESTS"
bats "${bats_opts[@]}" "${bats_filter[@]}" $TESTS bats "${bats_opts[@]}" "${bats_filter[@]}" $TESTS
rc=$((rc | $?)) rc=$((rc | $?))

2
test/system/700-play.bats
View File

@ -11,7 +11,7 @@ function teardown() {
run_podman rm -t 0 -f -a run_podman rm -t 0 -f -a
run_podman image list --format '{{.ID}} {{.Repository}}' run_podman image list --format '{{.ID}} {{.Repository}}'
while read id name; do while read id name; do
if [[ "$name" =~ /pause ]]; then if [[ "$name" =~ /podman-pause ]]; then
run_podman rmi $id run_podman rmi $id
fi fi
done <<<"$output" done <<<"$output"