mirror of
https://github.com/containers/podman.git
synced 2025-05-20 00:27:03 +08:00
Cleanup: fix problems reported by shell lint
Followup to #15616, which is not usable as it is (way, way, way too much noise) but actually found a few real nits that should be fixed. Signed-off-by: Ed Santiago <santiago@redhat.com>
This commit is contained in:
@ -106,7 +106,7 @@ export PODMAN_ROOTLESS_USER=$(id -un)
|
||||
|
||||
# Root
|
||||
if [ -z "$ROOTLESS_ONLY" ]; then
|
||||
echo "# bats ${bats_filter[@]} $TESTS"
|
||||
echo "# bats ${bats_filter[*]} $TESTS"
|
||||
sudo --preserve-env=PODMAN \
|
||||
--preserve-env=PODMAN_TEST_DEBUG \
|
||||
--preserve-env=OCI_RUNTIME \
|
||||
@ -119,7 +119,7 @@ fi
|
||||
# Rootless. (Only if we're not already root)
|
||||
if [[ -z "$ROOT_ONLY" && "$(id -u)" != 0 ]]; then
|
||||
echo "--------------------------------------------------"
|
||||
echo "\$ bats ${bats_filter[@]} $TESTS"
|
||||
echo "\$ bats ${bats_filter[*]} $TESTS"
|
||||
bats "${bats_opts[@]}" "${bats_filter[@]}" $TESTS
|
||||
rc=$((rc | $?))
|
||||
fi
|
||||
|
@ -1,5 +1,5 @@
|
||||
#!/usr/bin/env bash
|
||||
if ! [ $(id -u) = 0 ]; then
|
||||
echo "Please run as root! '$@' requires root privileges."
|
||||
echo "Please run as root! '$*' requires root privileges."
|
||||
exit 1
|
||||
fi
|
||||
|
@ -87,7 +87,7 @@ function compare_usage() {
|
||||
|
||||
# strip off command name from both
|
||||
from_man=$(sed -e "s/\*\*$cmd\*\*[[:space:]]*//" <<<"$from_man")
|
||||
from_help=$(sed -e "s/^[[:space:]]*$cmd[[:space:]]*//" <<<"$from_help")
|
||||
from_help=$(sed -e "s/^[[:space:]]*${cmd}[[:space:]]*//" <<<"$from_help")
|
||||
|
||||
# man page lists 'foo [*options*]', help msg shows 'foo [flags]'.
|
||||
# Make sure if one has it, the other does too.
|
||||
@ -153,7 +153,7 @@ for md in *.1.md;do
|
||||
# special case: the command is "auto-update", with a hyphen
|
||||
md_nodash='podman auto-update'
|
||||
fi
|
||||
if [ "$cmd" != "$md_nodash" -a "$cmd" != "podman-remote" ]; then
|
||||
if [[ "$cmd" != "$md_nodash" ]] && [[ "$cmd" != "podman-remote" ]]; then
|
||||
echo
|
||||
printf "Inconsistent program name in SYNOPSIS in %s:\n" $md
|
||||
printf " SYNOPSIS = %s (expected: '%s')\n" "$cmd" "$md_nodash"
|
||||
|
@ -272,8 +272,8 @@ function t() {
|
||||
esac
|
||||
done
|
||||
if [[ -z "$curl_args" ]]; then
|
||||
curl_args=(-d $(jsonify ${post_args[@]}))
|
||||
testname="$testname [${curl_args[@]}]"
|
||||
curl_args=(-d $(jsonify ${post_args[*]}))
|
||||
testname="$testname [${curl_args[*]}]"
|
||||
fi
|
||||
fi
|
||||
|
||||
@ -336,7 +336,7 @@ function t() {
|
||||
|
||||
# Any error from curl is instant bad news, from which we can't recover
|
||||
if [[ $rc -ne 0 ]]; then
|
||||
die "curl failure ($rc) on $url - cannot continue"
|
||||
die "curl failure ($rc) on $url - cannot continue. args=${curl_args[*]}"
|
||||
fi
|
||||
|
||||
# Show returned headers (without trailing ^M or empty lines) in log file.
|
||||
@ -384,7 +384,7 @@ function t() {
|
||||
|
||||
# Special case: if response code does not match, dump the response body
|
||||
# and skip all further subtests.
|
||||
if [[ $actual_code != $expected_code ]]; then
|
||||
if [[ "$actual_code" != "$expected_code" ]]; then
|
||||
echo -e "# response: $output"
|
||||
for i; do
|
||||
_show_ok skip "$testname: $i # skip - wrong return code"
|
||||
@ -671,11 +671,11 @@ echo -e "collected ${#tests_to_run[@]} items\n"
|
||||
|
||||
start_service
|
||||
|
||||
for i in ${tests_to_run[@]}; do
|
||||
for i in "${tests_to_run[@]}"; do
|
||||
TEST_CONTEXT="[$(basename $i .at)]"
|
||||
|
||||
# Clear output from 'podman' helper
|
||||
>| $WORKDIR/output.log
|
||||
truncate --size=0 $WORKDIR/output.log
|
||||
|
||||
source $i
|
||||
done
|
||||
|
@ -17,7 +17,7 @@ if [[ ! $whereami =~ test-buildah-v ]]; then
|
||||
fi
|
||||
|
||||
# FIXME: check that git repo is buildah
|
||||
git remote -v | grep -q [BUILDAHREPO] \
|
||||
git remote -v | grep -q '[BUILDAHREPO]' \
|
||||
|| die "This does not look like a buildah repo (git remote -v)"
|
||||
|
||||
# We could do the commit automatically, but it's prudent to require human
|
||||
|
@ -64,7 +64,7 @@ function is() {
|
||||
local expect=$2
|
||||
local testname=$3
|
||||
|
||||
if [[ $actual = $expect ]]; then
|
||||
if [[ "$actual" = "$expect" ]]; then
|
||||
# On success, include expected value; this helps readers understand
|
||||
_show_ok 1 "$testname=$expect"
|
||||
return
|
||||
@ -303,12 +303,12 @@ n_tests=0
|
||||
# We aren't really TAP 13; this helps logformatter recognize our output as BATS
|
||||
echo "TAP version 13"
|
||||
|
||||
for t in ${tests_to_run[@]}; do
|
||||
for t in "${tests_to_run[@]}"; do
|
||||
testdir="$(dirname $t)"
|
||||
testname="$(basename $testdir)"
|
||||
|
||||
if [ -e $test_dir/SKIP ]; then
|
||||
local reason="$(<$test_dir/SKIP)"
|
||||
reason="$(<$test_dir/SKIP)"
|
||||
if [ -n "$reason" ]; then
|
||||
reason=" - $reason"
|
||||
fi
|
||||
|
@ -121,7 +121,7 @@ function check_help() {
|
||||
# Exceptions: these commands don't work rootless
|
||||
if is_rootless; then
|
||||
# "pause is not supported for rootless containers"
|
||||
if [ "$cmd" = "pause" -o "$cmd" = "unpause" ]; then
|
||||
if [[ "$cmd" = "pause" ]] || [[ "$cmd" = "unpause" ]]; then
|
||||
continue
|
||||
fi
|
||||
# "network rm" too
|
||||
@ -162,17 +162,17 @@ function check_help() {
|
||||
|
||||
# Any command that takes subcommands, prints its help and errors if called
|
||||
# without one.
|
||||
dprint "podman $@"
|
||||
dprint "podman $*"
|
||||
run_podman '?' "$@"
|
||||
is "$status" 125 "'podman $*' without any subcommand - exit status"
|
||||
is "$output" ".*Usage:.*Error: missing command '.*$@ COMMAND'" \
|
||||
is "$output" ".*Usage:.*Error: missing command '.*$* COMMAND'" \
|
||||
"'podman $*' without any subcommand - expected error message"
|
||||
|
||||
# Assume that 'NoSuchCommand' is not a command
|
||||
dprint "podman $@ NoSuchCommand"
|
||||
dprint "podman $* NoSuchCommand"
|
||||
run_podman '?' "$@" NoSuchCommand
|
||||
is "$status" 125 "'podman $* NoSuchCommand' - exit status"
|
||||
is "$output" "Error: unrecognized command .*$@ NoSuchCommand" \
|
||||
is "$output" "Error: unrecognized command .*$* NoSuchCommand" \
|
||||
"'podman $* NoSuchCommand' - expected error message"
|
||||
|
||||
# This can happen if the output of --help changes, such as between
|
||||
|
@ -436,7 +436,7 @@ load helpers
|
||||
run_podman cp cpcontainer:$src $destdir$dest
|
||||
is "$(< $destdir$dest_fullname/containerfile0)" "${randomcontent[0]}" "$description"
|
||||
is "$(< $destdir$dest_fullname/containerfile1)" "${randomcontent[1]}" "$description"
|
||||
rm -rf $destdir/*
|
||||
rm -rf ${destdir:?}/*
|
||||
done < <(parse_table "$tests")
|
||||
run_podman kill cpcontainer
|
||||
run_podman rm -t 0 -f cpcontainer
|
||||
@ -456,7 +456,7 @@ load helpers
|
||||
run_podman cp cpcontainer:$src $destdir$dest
|
||||
is "$(< $destdir$dest_fullname/containerfile0)" "${randomcontent[0]}" "$description"
|
||||
is "$(< $destdir$dest_fullname/containerfile1)" "${randomcontent[1]}" "$description"
|
||||
rm -rf $destdir/*
|
||||
rm -rf ${destdir:?}/*
|
||||
done < <(parse_table "$tests")
|
||||
|
||||
touch $destdir/testfile
|
||||
|
@ -541,7 +541,7 @@ Labels.$label_name | $label_value
|
||||
this-file-does-not-match-anything-in-ignore-file
|
||||
comment
|
||||
)
|
||||
for f in ${files[@]}; do
|
||||
for f in "${files[@]}"; do
|
||||
# The magic '##-' strips off the '-' prefix
|
||||
echo "$f" > $tmpdir/${f##-}
|
||||
done
|
||||
|
@ -315,11 +315,11 @@ EOF
|
||||
|
||||
# List available volumes for pruning after using 1,2,3
|
||||
run_podman volume prune <<< N
|
||||
is "$(echo $(sort <<<${lines[@]:1:3}))" "${v[4]} ${v[5]} ${v[6]}" "volume prune, with 1,2,3 in use, lists 4,5,6"
|
||||
is "$(echo $(sort <<<${lines[*]:1:3}))" "${v[4]} ${v[5]} ${v[6]}" "volume prune, with 1,2,3 in use, lists 4,5,6"
|
||||
|
||||
# List available volumes for pruning after using 1,2,3 and filtering; see #8913
|
||||
run_podman volume prune --filter label=mylabel <<< N
|
||||
is "$(echo $(sort <<<${lines[@]:1:2}))" "${v[5]} ${v[6]}" "volume prune, with 1,2,3 in use and 4 filtered out, lists 5,6"
|
||||
is "$(echo $(sort <<<${lines[*]:1:2}))" "${v[5]} ${v[6]}" "volume prune, with 1,2,3 in use and 4 filtered out, lists 5,6"
|
||||
|
||||
# prune should remove v4
|
||||
run_podman volume prune --force
|
||||
|
@ -119,7 +119,7 @@ EOF
|
||||
|
||||
# Some of the above may not exist on our host. Find only the ones that do.
|
||||
local -a subset=()
|
||||
for mp in ${mps[@]}; do
|
||||
for mp in "${mps[@]}"; do
|
||||
if [ -e $mp ]; then
|
||||
subset+=($mp)
|
||||
fi
|
||||
@ -128,7 +128,7 @@ EOF
|
||||
# Run 'stat' on all the files, plus /dev/null. Get path, file type,
|
||||
# number of links, major, and minor (see below for why). Do it all
|
||||
# in one go, to avoid multiple podman-runs
|
||||
run_podman '?' run --rm $IMAGE stat -c'%n:%F:%h:%T:%t' /dev/null ${subset[@]}
|
||||
run_podman '?' run --rm $IMAGE stat -c'%n:%F:%h:%T:%t' /dev/null "${subset[@]}"
|
||||
assert $status -le 1 "stat exit status: expected 0 or 1"
|
||||
|
||||
local devnull=
|
||||
|
Reference in New Issue
Block a user