DockerCLI/cli/command/container/rm_test.go

51 lines
1.3 KiB
Go
Raw Normal View History

Return zero exit-code when force-removing non-existing containers When using `docker rm` / `docker container rm` with the `-f` / `--force` option, attempts to remove non-existing containers should print a warning, but should return a zero exit code ("successful"). Currently, a non-zero exit code is returned, marking the removal as "failed"; $ docker rm -fv 798c9471b695 Error: No such container: 798c9471b695 $ echo $? 1 The command should match the behavior of `rm` / `rm -f`, with the exception that a warning is printed (instead of silently ignored): Running `rm` with `-f` silences output and returns a zero exit code: touch some-file && rm -f no-such-file some-file; echo exit code: $?; ls -la # exit code: 0 # total 0 # drwxr-xr-x 2 sebastiaan staff 64 Aug 14 12:17 . # drwxr-xr-x 199 sebastiaan staff 6368 Aug 14 12:13 .. mkdir some-directory && rm -rf no-such-directory some-directory; echo exit code: $?; ls -la # exit code: 0 # total 0 # drwxr-xr-x 2 sebastiaan staff 64 Aug 14 12:17 . # drwxr-xr-x 199 sebastiaan staff 6368 Aug 14 12:13 .. Note that other reasons for a delete to fail should still result in a non-zero exit code, matching the behavior of `rm`. For instance, in the example below, the `rm` failed because directories can only be removed if the `-r` option is used; touch some-file && mkdir some-directory && rm -f some-directory no-such-file some-file; echo exit code: $?; ls -la # rm: some-directory: is a directory # exit code: 1 # total 0 # drwxr-xr-x 3 sebastiaan staff 96 Aug 14 14:15 . # drwxr-xr-x 199 sebastiaan staff 6368 Aug 14 12:13 .. # drwxr-xr-x 2 sebastiaan staff 64 Aug 14 14:15 some-directory This patch updates the `docker rm` / `docker container rm` command to not produce an error when attempting to remove a missing containers, and instead only print the error, but return a zero (0) exit code. With this patch applied: docker create --name mycontainer busybox \ && docker rm nosuchcontainer mycontainer; \ echo exit code: $?; \ docker ps -a --filter name=mycontainer # df23cc8573f00e97d6e948b48d9ea7d75ce3b4faaab4fe1d3458d3bfa451f39d # mycontainer # Error: No such container: nosuchcontainer # exit code: 0 # CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-08-14 10:04:32 -04:00
package container
import (
"context"
"fmt"
"io/ioutil"
"sort"
"testing"
"github.com/docker/cli/internal/test"
"github.com/docker/docker/api/types"
"github.com/docker/docker/errdefs"
"gotest.tools/v3/assert"
)
func TestRemoveForce(t *testing.T) {
fix race condition in TestRemoveForce This test uses two subtests that were sharing the same variable. Subtests run in a goroutine, which could lead to them concurrently accessing the variable, resulting in a panic: === FAIL: cli/command/container TestRemoveForce/without_force (0.00s) Error: Error: No such container: nosuchcontainer --- FAIL: TestRemoveForce/without_force (0.00s) panic: runtime error: invalid memory address or nil pointer dereference [recovered] panic: runtime error: invalid memory address or nil pointer dereference [signal SIGSEGV: segmentation violation code=0x1 addr=0x0 pc=0x40393f] goroutine 190 [running]: testing.tRunner.func1.2({0xb76380, 0x124c9a0}) /usr/local/go/src/testing/testing.go:1389 +0x24e testing.tRunner.func1() /usr/local/go/src/testing/testing.go:1392 +0x39f panic({0xb76380, 0x124c9a0}) /usr/local/go/src/runtime/panic.go:838 +0x207 sort.StringSlice.Less(...) /usr/local/go/src/sort/sort.go:319 sort.insertionSort({0xd87380, 0xc00051b3b0}, 0x0, 0x2) /usr/local/go/src/sort/sort.go:40 +0xb1 sort.quickSort({0xd87380, 0xc00051b3b0}, 0x18?, 0xb4f060?, 0xc000540e01?) /usr/local/go/src/sort/sort.go:222 +0x171 sort.Sort({0xd87380, 0xc00051b3b0}) /usr/local/go/src/sort/sort.go:231 +0x53 sort.Strings(...) /usr/local/go/src/sort/sort.go:335 github.com/docker/cli/cli/command/container.TestRemoveForce.func2(0xc0005389c0?) /go/src/github.com/docker/cli/cli/command/container/rm_test.go:36 +0x125 testing.tRunner(0xc00053e4e0, 0xc00051b140) /usr/local/go/src/testing/testing.go:1439 +0x102 created by testing.(*T).Run /usr/local/go/src/testing/testing.go:1486 +0x35f === FAIL: cli/command/container TestRemoveForce (0.00s) This patch changes the test to use to separate variables. Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 9688f62d20cc13e1a68fa28ec56cdf03ddf5864e) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-03-31 16:52:04 -04:00
var (
removed1 []string
removed2 []string
)
Return zero exit-code when force-removing non-existing containers When using `docker rm` / `docker container rm` with the `-f` / `--force` option, attempts to remove non-existing containers should print a warning, but should return a zero exit code ("successful"). Currently, a non-zero exit code is returned, marking the removal as "failed"; $ docker rm -fv 798c9471b695 Error: No such container: 798c9471b695 $ echo $? 1 The command should match the behavior of `rm` / `rm -f`, with the exception that a warning is printed (instead of silently ignored): Running `rm` with `-f` silences output and returns a zero exit code: touch some-file && rm -f no-such-file some-file; echo exit code: $?; ls -la # exit code: 0 # total 0 # drwxr-xr-x 2 sebastiaan staff 64 Aug 14 12:17 . # drwxr-xr-x 199 sebastiaan staff 6368 Aug 14 12:13 .. mkdir some-directory && rm -rf no-such-directory some-directory; echo exit code: $?; ls -la # exit code: 0 # total 0 # drwxr-xr-x 2 sebastiaan staff 64 Aug 14 12:17 . # drwxr-xr-x 199 sebastiaan staff 6368 Aug 14 12:13 .. Note that other reasons for a delete to fail should still result in a non-zero exit code, matching the behavior of `rm`. For instance, in the example below, the `rm` failed because directories can only be removed if the `-r` option is used; touch some-file && mkdir some-directory && rm -f some-directory no-such-file some-file; echo exit code: $?; ls -la # rm: some-directory: is a directory # exit code: 1 # total 0 # drwxr-xr-x 3 sebastiaan staff 96 Aug 14 14:15 . # drwxr-xr-x 199 sebastiaan staff 6368 Aug 14 12:13 .. # drwxr-xr-x 2 sebastiaan staff 64 Aug 14 14:15 some-directory This patch updates the `docker rm` / `docker container rm` command to not produce an error when attempting to remove a missing containers, and instead only print the error, but return a zero (0) exit code. With this patch applied: docker create --name mycontainer busybox \ && docker rm nosuchcontainer mycontainer; \ echo exit code: $?; \ docker ps -a --filter name=mycontainer # df23cc8573f00e97d6e948b48d9ea7d75ce3b4faaab4fe1d3458d3bfa451f39d # mycontainer # Error: No such container: nosuchcontainer # exit code: 0 # CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-08-14 10:04:32 -04:00
cli := test.NewFakeCli(&fakeClient{
containerRemoveFunc: func(ctx context.Context, container string, options types.ContainerRemoveOptions) error {
fix race condition in TestRemoveForce This test uses two subtests that were sharing the same variable. Subtests run in a goroutine, which could lead to them concurrently accessing the variable, resulting in a panic: === FAIL: cli/command/container TestRemoveForce/without_force (0.00s) Error: Error: No such container: nosuchcontainer --- FAIL: TestRemoveForce/without_force (0.00s) panic: runtime error: invalid memory address or nil pointer dereference [recovered] panic: runtime error: invalid memory address or nil pointer dereference [signal SIGSEGV: segmentation violation code=0x1 addr=0x0 pc=0x40393f] goroutine 190 [running]: testing.tRunner.func1.2({0xb76380, 0x124c9a0}) /usr/local/go/src/testing/testing.go:1389 +0x24e testing.tRunner.func1() /usr/local/go/src/testing/testing.go:1392 +0x39f panic({0xb76380, 0x124c9a0}) /usr/local/go/src/runtime/panic.go:838 +0x207 sort.StringSlice.Less(...) /usr/local/go/src/sort/sort.go:319 sort.insertionSort({0xd87380, 0xc00051b3b0}, 0x0, 0x2) /usr/local/go/src/sort/sort.go:40 +0xb1 sort.quickSort({0xd87380, 0xc00051b3b0}, 0x18?, 0xb4f060?, 0xc000540e01?) /usr/local/go/src/sort/sort.go:222 +0x171 sort.Sort({0xd87380, 0xc00051b3b0}) /usr/local/go/src/sort/sort.go:231 +0x53 sort.Strings(...) /usr/local/go/src/sort/sort.go:335 github.com/docker/cli/cli/command/container.TestRemoveForce.func2(0xc0005389c0?) /go/src/github.com/docker/cli/cli/command/container/rm_test.go:36 +0x125 testing.tRunner(0xc00053e4e0, 0xc00051b140) /usr/local/go/src/testing/testing.go:1439 +0x102 created by testing.(*T).Run /usr/local/go/src/testing/testing.go:1486 +0x35f === FAIL: cli/command/container TestRemoveForce (0.00s) This patch changes the test to use to separate variables. Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 9688f62d20cc13e1a68fa28ec56cdf03ddf5864e) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-03-31 16:52:04 -04:00
removed1 = append(removed1, container)
removed2 = append(removed2, container)
Return zero exit-code when force-removing non-existing containers When using `docker rm` / `docker container rm` with the `-f` / `--force` option, attempts to remove non-existing containers should print a warning, but should return a zero exit code ("successful"). Currently, a non-zero exit code is returned, marking the removal as "failed"; $ docker rm -fv 798c9471b695 Error: No such container: 798c9471b695 $ echo $? 1 The command should match the behavior of `rm` / `rm -f`, with the exception that a warning is printed (instead of silently ignored): Running `rm` with `-f` silences output and returns a zero exit code: touch some-file && rm -f no-such-file some-file; echo exit code: $?; ls -la # exit code: 0 # total 0 # drwxr-xr-x 2 sebastiaan staff 64 Aug 14 12:17 . # drwxr-xr-x 199 sebastiaan staff 6368 Aug 14 12:13 .. mkdir some-directory && rm -rf no-such-directory some-directory; echo exit code: $?; ls -la # exit code: 0 # total 0 # drwxr-xr-x 2 sebastiaan staff 64 Aug 14 12:17 . # drwxr-xr-x 199 sebastiaan staff 6368 Aug 14 12:13 .. Note that other reasons for a delete to fail should still result in a non-zero exit code, matching the behavior of `rm`. For instance, in the example below, the `rm` failed because directories can only be removed if the `-r` option is used; touch some-file && mkdir some-directory && rm -f some-directory no-such-file some-file; echo exit code: $?; ls -la # rm: some-directory: is a directory # exit code: 1 # total 0 # drwxr-xr-x 3 sebastiaan staff 96 Aug 14 14:15 . # drwxr-xr-x 199 sebastiaan staff 6368 Aug 14 12:13 .. # drwxr-xr-x 2 sebastiaan staff 64 Aug 14 14:15 some-directory This patch updates the `docker rm` / `docker container rm` command to not produce an error when attempting to remove a missing containers, and instead only print the error, but return a zero (0) exit code. With this patch applied: docker create --name mycontainer busybox \ && docker rm nosuchcontainer mycontainer; \ echo exit code: $?; \ docker ps -a --filter name=mycontainer # df23cc8573f00e97d6e948b48d9ea7d75ce3b4faaab4fe1d3458d3bfa451f39d # mycontainer # Error: No such container: nosuchcontainer # exit code: 0 # CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-08-14 10:04:32 -04:00
if container == "nosuchcontainer" {
fix race condition in TestRemoveForce This test uses two subtests that were sharing the same variable. Subtests run in a goroutine, which could lead to them concurrently accessing the variable, resulting in a panic: === FAIL: cli/command/container TestRemoveForce/without_force (0.00s) Error: Error: No such container: nosuchcontainer --- FAIL: TestRemoveForce/without_force (0.00s) panic: runtime error: invalid memory address or nil pointer dereference [recovered] panic: runtime error: invalid memory address or nil pointer dereference [signal SIGSEGV: segmentation violation code=0x1 addr=0x0 pc=0x40393f] goroutine 190 [running]: testing.tRunner.func1.2({0xb76380, 0x124c9a0}) /usr/local/go/src/testing/testing.go:1389 +0x24e testing.tRunner.func1() /usr/local/go/src/testing/testing.go:1392 +0x39f panic({0xb76380, 0x124c9a0}) /usr/local/go/src/runtime/panic.go:838 +0x207 sort.StringSlice.Less(...) /usr/local/go/src/sort/sort.go:319 sort.insertionSort({0xd87380, 0xc00051b3b0}, 0x0, 0x2) /usr/local/go/src/sort/sort.go:40 +0xb1 sort.quickSort({0xd87380, 0xc00051b3b0}, 0x18?, 0xb4f060?, 0xc000540e01?) /usr/local/go/src/sort/sort.go:222 +0x171 sort.Sort({0xd87380, 0xc00051b3b0}) /usr/local/go/src/sort/sort.go:231 +0x53 sort.Strings(...) /usr/local/go/src/sort/sort.go:335 github.com/docker/cli/cli/command/container.TestRemoveForce.func2(0xc0005389c0?) /go/src/github.com/docker/cli/cli/command/container/rm_test.go:36 +0x125 testing.tRunner(0xc00053e4e0, 0xc00051b140) /usr/local/go/src/testing/testing.go:1439 +0x102 created by testing.(*T).Run /usr/local/go/src/testing/testing.go:1486 +0x35f === FAIL: cli/command/container TestRemoveForce (0.00s) This patch changes the test to use to separate variables. Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 9688f62d20cc13e1a68fa28ec56cdf03ddf5864e) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-03-31 16:52:04 -04:00
return errdefs.NotFound(fmt.Errorf("Error: no such container: " + container))
Return zero exit-code when force-removing non-existing containers When using `docker rm` / `docker container rm` with the `-f` / `--force` option, attempts to remove non-existing containers should print a warning, but should return a zero exit code ("successful"). Currently, a non-zero exit code is returned, marking the removal as "failed"; $ docker rm -fv 798c9471b695 Error: No such container: 798c9471b695 $ echo $? 1 The command should match the behavior of `rm` / `rm -f`, with the exception that a warning is printed (instead of silently ignored): Running `rm` with `-f` silences output and returns a zero exit code: touch some-file && rm -f no-such-file some-file; echo exit code: $?; ls -la # exit code: 0 # total 0 # drwxr-xr-x 2 sebastiaan staff 64 Aug 14 12:17 . # drwxr-xr-x 199 sebastiaan staff 6368 Aug 14 12:13 .. mkdir some-directory && rm -rf no-such-directory some-directory; echo exit code: $?; ls -la # exit code: 0 # total 0 # drwxr-xr-x 2 sebastiaan staff 64 Aug 14 12:17 . # drwxr-xr-x 199 sebastiaan staff 6368 Aug 14 12:13 .. Note that other reasons for a delete to fail should still result in a non-zero exit code, matching the behavior of `rm`. For instance, in the example below, the `rm` failed because directories can only be removed if the `-r` option is used; touch some-file && mkdir some-directory && rm -f some-directory no-such-file some-file; echo exit code: $?; ls -la # rm: some-directory: is a directory # exit code: 1 # total 0 # drwxr-xr-x 3 sebastiaan staff 96 Aug 14 14:15 . # drwxr-xr-x 199 sebastiaan staff 6368 Aug 14 12:13 .. # drwxr-xr-x 2 sebastiaan staff 64 Aug 14 14:15 some-directory This patch updates the `docker rm` / `docker container rm` command to not produce an error when attempting to remove a missing containers, and instead only print the error, but return a zero (0) exit code. With this patch applied: docker create --name mycontainer busybox \ && docker rm nosuchcontainer mycontainer; \ echo exit code: $?; \ docker ps -a --filter name=mycontainer # df23cc8573f00e97d6e948b48d9ea7d75ce3b4faaab4fe1d3458d3bfa451f39d # mycontainer # Error: No such container: nosuchcontainer # exit code: 0 # CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-08-14 10:04:32 -04:00
}
return nil
},
Version: "1.36",
})
cmd := NewRmCommand(cli)
cmd.SetOut(ioutil.Discard)
t.Run("without force", func(t *testing.T) {
cmd.SetArgs([]string{"nosuchcontainer", "mycontainer"})
fix race condition in TestRemoveForce This test uses two subtests that were sharing the same variable. Subtests run in a goroutine, which could lead to them concurrently accessing the variable, resulting in a panic: === FAIL: cli/command/container TestRemoveForce/without_force (0.00s) Error: Error: No such container: nosuchcontainer --- FAIL: TestRemoveForce/without_force (0.00s) panic: runtime error: invalid memory address or nil pointer dereference [recovered] panic: runtime error: invalid memory address or nil pointer dereference [signal SIGSEGV: segmentation violation code=0x1 addr=0x0 pc=0x40393f] goroutine 190 [running]: testing.tRunner.func1.2({0xb76380, 0x124c9a0}) /usr/local/go/src/testing/testing.go:1389 +0x24e testing.tRunner.func1() /usr/local/go/src/testing/testing.go:1392 +0x39f panic({0xb76380, 0x124c9a0}) /usr/local/go/src/runtime/panic.go:838 +0x207 sort.StringSlice.Less(...) /usr/local/go/src/sort/sort.go:319 sort.insertionSort({0xd87380, 0xc00051b3b0}, 0x0, 0x2) /usr/local/go/src/sort/sort.go:40 +0xb1 sort.quickSort({0xd87380, 0xc00051b3b0}, 0x18?, 0xb4f060?, 0xc000540e01?) /usr/local/go/src/sort/sort.go:222 +0x171 sort.Sort({0xd87380, 0xc00051b3b0}) /usr/local/go/src/sort/sort.go:231 +0x53 sort.Strings(...) /usr/local/go/src/sort/sort.go:335 github.com/docker/cli/cli/command/container.TestRemoveForce.func2(0xc0005389c0?) /go/src/github.com/docker/cli/cli/command/container/rm_test.go:36 +0x125 testing.tRunner(0xc00053e4e0, 0xc00051b140) /usr/local/go/src/testing/testing.go:1439 +0x102 created by testing.(*T).Run /usr/local/go/src/testing/testing.go:1486 +0x35f === FAIL: cli/command/container TestRemoveForce (0.00s) This patch changes the test to use to separate variables. Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 9688f62d20cc13e1a68fa28ec56cdf03ddf5864e) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-03-31 16:52:04 -04:00
removed1 = []string{}
assert.ErrorContains(t, cmd.Execute(), "no such container")
sort.Strings(removed1)
assert.DeepEqual(t, removed1, []string{"mycontainer", "nosuchcontainer"})
Return zero exit-code when force-removing non-existing containers When using `docker rm` / `docker container rm` with the `-f` / `--force` option, attempts to remove non-existing containers should print a warning, but should return a zero exit code ("successful"). Currently, a non-zero exit code is returned, marking the removal as "failed"; $ docker rm -fv 798c9471b695 Error: No such container: 798c9471b695 $ echo $? 1 The command should match the behavior of `rm` / `rm -f`, with the exception that a warning is printed (instead of silently ignored): Running `rm` with `-f` silences output and returns a zero exit code: touch some-file && rm -f no-such-file some-file; echo exit code: $?; ls -la # exit code: 0 # total 0 # drwxr-xr-x 2 sebastiaan staff 64 Aug 14 12:17 . # drwxr-xr-x 199 sebastiaan staff 6368 Aug 14 12:13 .. mkdir some-directory && rm -rf no-such-directory some-directory; echo exit code: $?; ls -la # exit code: 0 # total 0 # drwxr-xr-x 2 sebastiaan staff 64 Aug 14 12:17 . # drwxr-xr-x 199 sebastiaan staff 6368 Aug 14 12:13 .. Note that other reasons for a delete to fail should still result in a non-zero exit code, matching the behavior of `rm`. For instance, in the example below, the `rm` failed because directories can only be removed if the `-r` option is used; touch some-file && mkdir some-directory && rm -f some-directory no-such-file some-file; echo exit code: $?; ls -la # rm: some-directory: is a directory # exit code: 1 # total 0 # drwxr-xr-x 3 sebastiaan staff 96 Aug 14 14:15 . # drwxr-xr-x 199 sebastiaan staff 6368 Aug 14 12:13 .. # drwxr-xr-x 2 sebastiaan staff 64 Aug 14 14:15 some-directory This patch updates the `docker rm` / `docker container rm` command to not produce an error when attempting to remove a missing containers, and instead only print the error, but return a zero (0) exit code. With this patch applied: docker create --name mycontainer busybox \ && docker rm nosuchcontainer mycontainer; \ echo exit code: $?; \ docker ps -a --filter name=mycontainer # df23cc8573f00e97d6e948b48d9ea7d75ce3b4faaab4fe1d3458d3bfa451f39d # mycontainer # Error: No such container: nosuchcontainer # exit code: 0 # CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-08-14 10:04:32 -04:00
})
t.Run("with force", func(t *testing.T) {
cmd.SetArgs([]string{"--force", "nosuchcontainer", "mycontainer"})
fix race condition in TestRemoveForce This test uses two subtests that were sharing the same variable. Subtests run in a goroutine, which could lead to them concurrently accessing the variable, resulting in a panic: === FAIL: cli/command/container TestRemoveForce/without_force (0.00s) Error: Error: No such container: nosuchcontainer --- FAIL: TestRemoveForce/without_force (0.00s) panic: runtime error: invalid memory address or nil pointer dereference [recovered] panic: runtime error: invalid memory address or nil pointer dereference [signal SIGSEGV: segmentation violation code=0x1 addr=0x0 pc=0x40393f] goroutine 190 [running]: testing.tRunner.func1.2({0xb76380, 0x124c9a0}) /usr/local/go/src/testing/testing.go:1389 +0x24e testing.tRunner.func1() /usr/local/go/src/testing/testing.go:1392 +0x39f panic({0xb76380, 0x124c9a0}) /usr/local/go/src/runtime/panic.go:838 +0x207 sort.StringSlice.Less(...) /usr/local/go/src/sort/sort.go:319 sort.insertionSort({0xd87380, 0xc00051b3b0}, 0x0, 0x2) /usr/local/go/src/sort/sort.go:40 +0xb1 sort.quickSort({0xd87380, 0xc00051b3b0}, 0x18?, 0xb4f060?, 0xc000540e01?) /usr/local/go/src/sort/sort.go:222 +0x171 sort.Sort({0xd87380, 0xc00051b3b0}) /usr/local/go/src/sort/sort.go:231 +0x53 sort.Strings(...) /usr/local/go/src/sort/sort.go:335 github.com/docker/cli/cli/command/container.TestRemoveForce.func2(0xc0005389c0?) /go/src/github.com/docker/cli/cli/command/container/rm_test.go:36 +0x125 testing.tRunner(0xc00053e4e0, 0xc00051b140) /usr/local/go/src/testing/testing.go:1439 +0x102 created by testing.(*T).Run /usr/local/go/src/testing/testing.go:1486 +0x35f === FAIL: cli/command/container TestRemoveForce (0.00s) This patch changes the test to use to separate variables. Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 9688f62d20cc13e1a68fa28ec56cdf03ddf5864e) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-03-31 16:52:04 -04:00
removed2 = []string{}
Return zero exit-code when force-removing non-existing containers When using `docker rm` / `docker container rm` with the `-f` / `--force` option, attempts to remove non-existing containers should print a warning, but should return a zero exit code ("successful"). Currently, a non-zero exit code is returned, marking the removal as "failed"; $ docker rm -fv 798c9471b695 Error: No such container: 798c9471b695 $ echo $? 1 The command should match the behavior of `rm` / `rm -f`, with the exception that a warning is printed (instead of silently ignored): Running `rm` with `-f` silences output and returns a zero exit code: touch some-file && rm -f no-such-file some-file; echo exit code: $?; ls -la # exit code: 0 # total 0 # drwxr-xr-x 2 sebastiaan staff 64 Aug 14 12:17 . # drwxr-xr-x 199 sebastiaan staff 6368 Aug 14 12:13 .. mkdir some-directory && rm -rf no-such-directory some-directory; echo exit code: $?; ls -la # exit code: 0 # total 0 # drwxr-xr-x 2 sebastiaan staff 64 Aug 14 12:17 . # drwxr-xr-x 199 sebastiaan staff 6368 Aug 14 12:13 .. Note that other reasons for a delete to fail should still result in a non-zero exit code, matching the behavior of `rm`. For instance, in the example below, the `rm` failed because directories can only be removed if the `-r` option is used; touch some-file && mkdir some-directory && rm -f some-directory no-such-file some-file; echo exit code: $?; ls -la # rm: some-directory: is a directory # exit code: 1 # total 0 # drwxr-xr-x 3 sebastiaan staff 96 Aug 14 14:15 . # drwxr-xr-x 199 sebastiaan staff 6368 Aug 14 12:13 .. # drwxr-xr-x 2 sebastiaan staff 64 Aug 14 14:15 some-directory This patch updates the `docker rm` / `docker container rm` command to not produce an error when attempting to remove a missing containers, and instead only print the error, but return a zero (0) exit code. With this patch applied: docker create --name mycontainer busybox \ && docker rm nosuchcontainer mycontainer; \ echo exit code: $?; \ docker ps -a --filter name=mycontainer # df23cc8573f00e97d6e948b48d9ea7d75ce3b4faaab4fe1d3458d3bfa451f39d # mycontainer # Error: No such container: nosuchcontainer # exit code: 0 # CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-08-14 10:04:32 -04:00
assert.NilError(t, cmd.Execute())
fix race condition in TestRemoveForce This test uses two subtests that were sharing the same variable. Subtests run in a goroutine, which could lead to them concurrently accessing the variable, resulting in a panic: === FAIL: cli/command/container TestRemoveForce/without_force (0.00s) Error: Error: No such container: nosuchcontainer --- FAIL: TestRemoveForce/without_force (0.00s) panic: runtime error: invalid memory address or nil pointer dereference [recovered] panic: runtime error: invalid memory address or nil pointer dereference [signal SIGSEGV: segmentation violation code=0x1 addr=0x0 pc=0x40393f] goroutine 190 [running]: testing.tRunner.func1.2({0xb76380, 0x124c9a0}) /usr/local/go/src/testing/testing.go:1389 +0x24e testing.tRunner.func1() /usr/local/go/src/testing/testing.go:1392 +0x39f panic({0xb76380, 0x124c9a0}) /usr/local/go/src/runtime/panic.go:838 +0x207 sort.StringSlice.Less(...) /usr/local/go/src/sort/sort.go:319 sort.insertionSort({0xd87380, 0xc00051b3b0}, 0x0, 0x2) /usr/local/go/src/sort/sort.go:40 +0xb1 sort.quickSort({0xd87380, 0xc00051b3b0}, 0x18?, 0xb4f060?, 0xc000540e01?) /usr/local/go/src/sort/sort.go:222 +0x171 sort.Sort({0xd87380, 0xc00051b3b0}) /usr/local/go/src/sort/sort.go:231 +0x53 sort.Strings(...) /usr/local/go/src/sort/sort.go:335 github.com/docker/cli/cli/command/container.TestRemoveForce.func2(0xc0005389c0?) /go/src/github.com/docker/cli/cli/command/container/rm_test.go:36 +0x125 testing.tRunner(0xc00053e4e0, 0xc00051b140) /usr/local/go/src/testing/testing.go:1439 +0x102 created by testing.(*T).Run /usr/local/go/src/testing/testing.go:1486 +0x35f === FAIL: cli/command/container TestRemoveForce (0.00s) This patch changes the test to use to separate variables. Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 9688f62d20cc13e1a68fa28ec56cdf03ddf5864e) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-03-31 16:52:04 -04:00
sort.Strings(removed2)
assert.DeepEqual(t, removed2, []string{"mycontainer", "nosuchcontainer"})
Return zero exit-code when force-removing non-existing containers When using `docker rm` / `docker container rm` with the `-f` / `--force` option, attempts to remove non-existing containers should print a warning, but should return a zero exit code ("successful"). Currently, a non-zero exit code is returned, marking the removal as "failed"; $ docker rm -fv 798c9471b695 Error: No such container: 798c9471b695 $ echo $? 1 The command should match the behavior of `rm` / `rm -f`, with the exception that a warning is printed (instead of silently ignored): Running `rm` with `-f` silences output and returns a zero exit code: touch some-file && rm -f no-such-file some-file; echo exit code: $?; ls -la # exit code: 0 # total 0 # drwxr-xr-x 2 sebastiaan staff 64 Aug 14 12:17 . # drwxr-xr-x 199 sebastiaan staff 6368 Aug 14 12:13 .. mkdir some-directory && rm -rf no-such-directory some-directory; echo exit code: $?; ls -la # exit code: 0 # total 0 # drwxr-xr-x 2 sebastiaan staff 64 Aug 14 12:17 . # drwxr-xr-x 199 sebastiaan staff 6368 Aug 14 12:13 .. Note that other reasons for a delete to fail should still result in a non-zero exit code, matching the behavior of `rm`. For instance, in the example below, the `rm` failed because directories can only be removed if the `-r` option is used; touch some-file && mkdir some-directory && rm -f some-directory no-such-file some-file; echo exit code: $?; ls -la # rm: some-directory: is a directory # exit code: 1 # total 0 # drwxr-xr-x 3 sebastiaan staff 96 Aug 14 14:15 . # drwxr-xr-x 199 sebastiaan staff 6368 Aug 14 12:13 .. # drwxr-xr-x 2 sebastiaan staff 64 Aug 14 14:15 some-directory This patch updates the `docker rm` / `docker container rm` command to not produce an error when attempting to remove a missing containers, and instead only print the error, but return a zero (0) exit code. With this patch applied: docker create --name mycontainer busybox \ && docker rm nosuchcontainer mycontainer; \ echo exit code: $?; \ docker ps -a --filter name=mycontainer # df23cc8573f00e97d6e948b48d9ea7d75ce3b4faaab4fe1d3458d3bfa451f39d # mycontainer # Error: No such container: nosuchcontainer # exit code: 0 # CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-08-14 10:04:32 -04:00
})
}