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

Merge pull request #12603 from vrothberg/fix-kill

Browse Source 
kill: fix output
This commit is contained in:
OpenShift Merge Robot
2021-12-16 14:21:49 +01:00
committed by GitHub
parent d984fec351 3b6510da68
commit 91e55e263e
2 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cmd/podman/containers/kill.go
View File

@ -108,10 +108,13 @@ func kill(_ *cobra.Command, args []string) error {
return err return err
} }
for _, r := range responses { for _, r := range responses {
if r.Err == nil { switch {
fmt.Println(r.RawInput) case r.Err != nil:
} else {
errs = append(errs, r.Err) errs = append(errs, r.Err)
case r.RawInput != "":
fmt.Println(r.RawInput)
default:
fmt.Println(r.Id)
} }
} }
return errs.PrintErrors() return errs.PrintErrors()

14
test/system/130-kill.bats
View File

@ -116,4 +116,18 @@ load helpers
is "$output" "Error: valid signals are 1 through 64" "podman create" is "$output" "Error: valid signals are 1 through 64" "podman create"
} }
@test "podman kill - print IDs or raw input" {
# kill -a must print the IDs
run_podman run --rm -d $IMAGE top
ctrID="$output"
run_podman kill -a
is "$output" "$ctrID"
# kill $input must print $input
cname=$(random_string)
run_podman run --rm -d --name $cname $IMAGE top
run_podman kill $cname
is "$output" $cname
}
# vim: filetype=sh # vim: filetype=sh