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

System tests: confirm that -a and -l clash

Browse Source 
...and fix one instance where there was no check

Signed-off-by: Ed Santiago <santiago@redhat.com>
This commit is contained in:
Ed Santiago
2021-10-20 09:11:57 -06:00
parent eba281c3e0
commit 70a5d8cd1d
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/podman/containers/start.go
View File

@ -87,6 +87,9 @@ func validateStart(cmd *cobra.Command, args []string) error {
if len(args) == 0 && !startOptions.Latest && !startOptions.All {
return errors.New("start requires at least one argument")
}
if startOptions.All && startOptions.Latest {
return errors.Errorf("--all and --latest cannot be used together")
}
if len(args) > 0 && startOptions.Latest {
return errors.Errorf("--latest and containers cannot be used together")
}

6
test/system/015-help.bats
View File

@ -86,6 +86,12 @@ function check_help() {
run_podman 125 "$@" $cmd -l nonexistent-container
is "$output" "Error: .*--latest and \(containers\|pods\|arguments\) cannot be used together" \
"'$command_string' with both -l and container"
# Combine -l and -a, too (but spell it as --all, because "-a"
# means "attach" in podman container start)
run_podman 125 "$@" $cmd --all --latest
is "$output" "Error: \(--all and --latest cannot be used together\|--all, --latest and containers cannot be used together\|--all, --latest and arguments cannot be used together\|unknown flag\)" \
"'$command_string' with both --all and --latest"
fi
fi

4
test/system/045-start.bats
View File

@ -36,10 +36,6 @@ load helpers
expected="Error: either start all containers or the container(s) provided in the arguments"
run_podman 125 start --all 12333
is "$output" "$expected" "start --all, with args, throws error"
if ! is_remote; then
run_podman 125 start --all --latest
is "$output" "$expected" "podman start --all --latest"
fi
}
@test "podman start --filter - start only containers that match the filter" {