mirror of
https://github.com/containers/podman.git
synced 2025-07-29 11:22:38 +08:00
remote kill: don't wait for the container to stop
Invert the branch logic to match the comment. Docker seems to wait for the container while Podman does not. Enable the remote-disabled system test as well. Fixes: #7135 Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
This commit is contained in:
@ -174,7 +174,7 @@ func KillContainer(w http.ResponseWriter, r *http.Request) {
|
||||
utils.Error(w, "Something went wrong.", http.StatusInternalServerError, errors.Wrapf(err, "unable to kill Container %s", name))
|
||||
}
|
||||
|
||||
if utils.IsLibpodRequest(r) {
|
||||
if !utils.IsLibpodRequest(r) {
|
||||
// the kill behavior for docker differs from podman in that they appear to wait
|
||||
// for the Container to croak so the exit code is accurate immediately after the
|
||||
// kill is sent. libpod does not. but we can add a wait here only for the docker
|
||||
|
@ -6,8 +6,6 @@
|
||||
load helpers
|
||||
|
||||
@test "podman kill - test signal handling in containers" {
|
||||
skip_if_remote "FIXME: pending #7135"
|
||||
|
||||
# podman-remote and crun interact poorly in f31: crun seems to gobble up
|
||||
# some signals.
|
||||
# Workaround: run 'env --default-signal sh' instead of just 'sh' in
|
||||
|
Reference in New Issue
Block a user