From 5a99ea9ad4d12578396bfadc94e09e69214fcda2 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Sat, 1 Feb 2025 14:39:47 +0100 Subject: [PATCH] cli/command/container: remove uses of pkg/errors in tests While there may be reasons to keep pkg/errors in production code, we don't need them for these tests. Signed-off-by: Sebastiaan van Stijn --- cli/command/container/attach_test.go | 4 ++-- cli/command/container/commit_test.go | 2 +- cli/command/container/diff_test.go | 2 +- cli/command/container/exec_test.go | 4 ++-- cli/command/container/opts_test.go | 4 ++-- cli/command/container/prune_test.go | 2 +- cli/command/container/rename_test.go | 2 +- cli/command/container/restart_test.go | 2 +- cli/command/container/stop_test.go | 2 +- cli/command/container/tty_test.go | 4 ++-- 10 files changed, 14 insertions(+), 14 deletions(-) diff --git a/cli/command/container/attach_test.go b/cli/command/container/attach_test.go index 5b0276f38c..b4ae6e9f45 100644 --- a/cli/command/container/attach_test.go +++ b/cli/command/container/attach_test.go @@ -1,13 +1,13 @@ package container import ( + "errors" "io" "testing" "github.com/docker/cli/cli" "github.com/docker/cli/internal/test" "github.com/docker/docker/api/types/container" - "github.com/pkg/errors" "gotest.tools/v3/assert" ) @@ -23,7 +23,7 @@ func TestNewAttachCommandErrors(t *testing.T) { args: []string{"5cb5bb5e4a3b"}, expectedError: "something went wrong", containerInspectFunc: func(containerID string) (container.InspectResponse, error) { - return container.InspectResponse{}, errors.Errorf("something went wrong") + return container.InspectResponse{}, errors.New("something went wrong") }, }, { diff --git a/cli/command/container/commit_test.go b/cli/command/container/commit_test.go index a9127035a2..b19d9ced4f 100644 --- a/cli/command/container/commit_test.go +++ b/cli/command/container/commit_test.go @@ -2,13 +2,13 @@ package container import ( "context" + "errors" "io" "testing" "github.com/docker/cli/internal/test" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/container" - "github.com/pkg/errors" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" ) diff --git a/cli/command/container/diff_test.go b/cli/command/container/diff_test.go index 2fb191fe81..fd2271e434 100644 --- a/cli/command/container/diff_test.go +++ b/cli/command/container/diff_test.go @@ -2,13 +2,13 @@ package container import ( "context" + "errors" "io" "strings" "testing" "github.com/docker/cli/internal/test" "github.com/docker/docker/api/types/container" - "github.com/pkg/errors" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" ) diff --git a/cli/command/container/exec_test.go b/cli/command/container/exec_test.go index 89193b29f4..2d4a0ff168 100644 --- a/cli/command/container/exec_test.go +++ b/cli/command/container/exec_test.go @@ -2,6 +2,7 @@ package container import ( "context" + "errors" "io" "os" "testing" @@ -12,7 +13,6 @@ import ( "github.com/docker/cli/opts" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/container" - "github.com/pkg/errors" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" "gotest.tools/v3/fs" @@ -259,7 +259,7 @@ func TestNewExecCommandErrors(t *testing.T) { args: []string{"5cb5bb5e4a3b", "-t", "-i", "bash"}, expectedError: "something went wrong", containerInspectFunc: func(containerID string) (container.InspectResponse, error) { - return container.InspectResponse{}, errors.Errorf("something went wrong") + return container.InspectResponse{}, errors.New("something went wrong") }, }, } diff --git a/cli/command/container/opts_test.go b/cli/command/container/opts_test.go index 0acb16431b..720c9dfa04 100644 --- a/cli/command/container/opts_test.go +++ b/cli/command/container/opts_test.go @@ -1,6 +1,7 @@ package container import ( + "errors" "fmt" "io" "os" @@ -12,7 +13,6 @@ import ( "github.com/docker/docker/api/types/container" networktypes "github.com/docker/docker/api/types/network" "github.com/docker/go-connections/nat" - "github.com/pkg/errors" "github.com/spf13/pflag" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" @@ -340,7 +340,7 @@ func compareRandomizedStrings(a, b, c, d string) error { if a == d && b == c { return nil } - return errors.Errorf("strings don't match") + return errors.New("strings don't match") } // Simple parse with MacAddress validation diff --git a/cli/command/container/prune_test.go b/cli/command/container/prune_test.go index 1ded0f2882..6700235c3d 100644 --- a/cli/command/container/prune_test.go +++ b/cli/command/container/prune_test.go @@ -2,13 +2,13 @@ package container import ( "context" + "errors" "io" "testing" "github.com/docker/cli/internal/test" "github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/filters" - "github.com/pkg/errors" ) func TestContainerPrunePromptTermination(t *testing.T) { diff --git a/cli/command/container/rename_test.go b/cli/command/container/rename_test.go index 4d9c3f664d..9a2cae4b3c 100644 --- a/cli/command/container/rename_test.go +++ b/cli/command/container/rename_test.go @@ -2,11 +2,11 @@ package container import ( "context" + "errors" "io" "testing" "github.com/docker/cli/internal/test" - "github.com/pkg/errors" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" ) diff --git a/cli/command/container/restart_test.go b/cli/command/container/restart_test.go index f09323ec2a..a5cdb1cf1b 100644 --- a/cli/command/container/restart_test.go +++ b/cli/command/container/restart_test.go @@ -2,6 +2,7 @@ package container import ( "context" + "errors" "io" "sort" "sync" @@ -10,7 +11,6 @@ import ( "github.com/docker/cli/internal/test" "github.com/docker/docker/api/types/container" "github.com/docker/docker/errdefs" - "github.com/pkg/errors" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" ) diff --git a/cli/command/container/stop_test.go b/cli/command/container/stop_test.go index 50013d4775..83a9b706f1 100644 --- a/cli/command/container/stop_test.go +++ b/cli/command/container/stop_test.go @@ -2,6 +2,7 @@ package container import ( "context" + "errors" "io" "sort" "sync" @@ -10,7 +11,6 @@ import ( "github.com/docker/cli/internal/test" "github.com/docker/docker/api/types/container" "github.com/docker/docker/errdefs" - "github.com/pkg/errors" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" ) diff --git a/cli/command/container/tty_test.go b/cli/command/container/tty_test.go index c90d9417a7..0c4111e40d 100644 --- a/cli/command/container/tty_test.go +++ b/cli/command/container/tty_test.go @@ -2,13 +2,13 @@ package container import ( "context" + "errors" "testing" "time" "github.com/docker/cli/cli/command" "github.com/docker/cli/internal/test" "github.com/docker/docker/api/types/container" - "github.com/pkg/errors" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" ) @@ -16,7 +16,7 @@ import ( func TestInitTtySizeErrors(t *testing.T) { expectedError := "failed to resize tty, using default size\n" fakeContainerExecResizeFunc := func(id string, options container.ResizeOptions) error { - return errors.Errorf("Error response from daemon: no such exec") + return errors.New("Error response from daemon: no such exec") } fakeResizeTtyFunc := func(ctx context.Context, cli command.Cli, id string, isExec bool) error { height, width := uint(1024), uint(768)