opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-07-04 18:27:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12322 from edsantiago/bats_helper_bins

Browse Source 
hack/bats: deal with new bin helpers
This commit is contained in:
OpenShift Merge Robot
2021-11-16 22:51:32 +01:00
committed by GitHub
parent 197ebe8b5e e367f46147
commit 059785c3ed
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"