From 02eb72380ff368dfff89ba755207a8f644a77b10 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 29 Jan 2025 00:27:40 +0100 Subject: [PATCH] client: 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 --- client/config_inspect_test.go | 2 +- client/container_inspect_test.go | 2 +- client/container_wait_test.go | 2 +- client/distribution_inspect_test.go | 2 +- client/hijack_test.go | 9 ++++----- client/image_inspect_test.go | 2 +- client/node_inspect_test.go | 2 +- client/plugin_inspect_test.go | 2 +- client/secret_inspect_test.go | 2 +- client/service_inspect_test.go | 2 +- client/task_inspect_test.go | 2 +- client/volume_inspect_test.go | 2 +- 12 files changed, 15 insertions(+), 16 deletions(-) diff --git a/client/config_inspect_test.go b/client/config_inspect_test.go index f2b196981c..a47a8251b5 100644 --- a/client/config_inspect_test.go +++ b/client/config_inspect_test.go @@ -4,6 +4,7 @@ import ( "bytes" "context" "encoding/json" + "errors" "fmt" "io" "net/http" @@ -12,7 +13,6 @@ import ( "github.com/docker/docker/api/types/swarm" "github.com/docker/docker/errdefs" - "github.com/pkg/errors" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" ) diff --git a/client/container_inspect_test.go b/client/container_inspect_test.go index 9fb584c294..c1fe267646 100644 --- a/client/container_inspect_test.go +++ b/client/container_inspect_test.go @@ -4,6 +4,7 @@ import ( "bytes" "context" "encoding/json" + "errors" "fmt" "io" "net/http" @@ -12,7 +13,6 @@ import ( "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/client/container_wait_test.go b/client/container_wait_test.go index 30854e46ae..d2d02cc9da 100644 --- a/client/container_wait_test.go +++ b/client/container_wait_test.go @@ -4,6 +4,7 @@ import ( "bytes" "context" "encoding/json" + "errors" "fmt" "io" "log" @@ -16,7 +17,6 @@ import ( "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/client/distribution_inspect_test.go b/client/distribution_inspect_test.go index 90fbf1b09d..853ac36543 100644 --- a/client/distribution_inspect_test.go +++ b/client/distribution_inspect_test.go @@ -2,11 +2,11 @@ package client // import "github.com/docker/docker/client" import ( "context" + "errors" "net/http" "testing" "github.com/docker/docker/errdefs" - "github.com/pkg/errors" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" ) diff --git a/client/hijack_test.go b/client/hijack_test.go index ebea518c13..ead1547dc4 100644 --- a/client/hijack_test.go +++ b/client/hijack_test.go @@ -13,7 +13,6 @@ import ( "github.com/docker/docker/api/server/httputils" "github.com/docker/docker/api/types" - "github.com/pkg/errors" "gotest.tools/v3/assert" ) @@ -27,13 +26,13 @@ func TestTLSCloseWriter(t *testing.T) { chErr = make(chan error, 1) defer close(chErr) if err := httputils.ParseForm(req); err != nil { - chErr <- errors.Wrap(err, "error parsing form") + chErr <- fmt.Errorf("error parsing form: %w", err) http.Error(w, err.Error(), http.StatusInternalServerError) return } r, rw, err := httputils.HijackConnection(w) if err != nil { - chErr <- errors.Wrap(err, "error hijacking connection") + chErr <- fmt.Errorf("error hijacking connection: %w", err) http.Error(w, err.Error(), http.StatusInternalServerError) return } @@ -44,12 +43,12 @@ func TestTLSCloseWriter(t *testing.T) { buf := make([]byte, 5) _, err = r.Read(buf) if err != nil { - chErr <- errors.Wrap(err, "error reading from client") + chErr <- fmt.Errorf("error reading from client: %w", err) return } _, err = rw.Write(buf) if err != nil { - chErr <- errors.Wrap(err, "error writing to client") + chErr <- fmt.Errorf("error writing to client: %w", err) return } }), diff --git a/client/image_inspect_test.go b/client/image_inspect_test.go index 144dd799b1..d2796b5472 100644 --- a/client/image_inspect_test.go +++ b/client/image_inspect_test.go @@ -4,6 +4,7 @@ import ( "bytes" "context" "encoding/json" + "errors" "fmt" "io" "net/http" @@ -13,7 +14,6 @@ import ( "github.com/docker/docker/api/types/image" "github.com/docker/docker/errdefs" - "github.com/pkg/errors" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" ) diff --git a/client/node_inspect_test.go b/client/node_inspect_test.go index 4cd4eb42b4..ae547b6688 100644 --- a/client/node_inspect_test.go +++ b/client/node_inspect_test.go @@ -4,6 +4,7 @@ import ( "bytes" "context" "encoding/json" + "errors" "fmt" "io" "net/http" @@ -12,7 +13,6 @@ import ( "github.com/docker/docker/api/types/swarm" "github.com/docker/docker/errdefs" - "github.com/pkg/errors" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" ) diff --git a/client/plugin_inspect_test.go b/client/plugin_inspect_test.go index c850e3459d..015adf1ad1 100644 --- a/client/plugin_inspect_test.go +++ b/client/plugin_inspect_test.go @@ -4,6 +4,7 @@ import ( "bytes" "context" "encoding/json" + "errors" "fmt" "io" "net/http" @@ -12,7 +13,6 @@ import ( "github.com/docker/docker/api/types" "github.com/docker/docker/errdefs" - "github.com/pkg/errors" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" ) diff --git a/client/secret_inspect_test.go b/client/secret_inspect_test.go index ceae13ed23..187f2a4b67 100644 --- a/client/secret_inspect_test.go +++ b/client/secret_inspect_test.go @@ -4,6 +4,7 @@ import ( "bytes" "context" "encoding/json" + "errors" "fmt" "io" "net/http" @@ -12,7 +13,6 @@ import ( "github.com/docker/docker/api/types/swarm" "github.com/docker/docker/errdefs" - "github.com/pkg/errors" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" ) diff --git a/client/service_inspect_test.go b/client/service_inspect_test.go index 053efd5d28..9acd7c1034 100644 --- a/client/service_inspect_test.go +++ b/client/service_inspect_test.go @@ -4,6 +4,7 @@ import ( "bytes" "context" "encoding/json" + "errors" "fmt" "io" "net/http" @@ -13,7 +14,6 @@ import ( "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/swarm" "github.com/docker/docker/errdefs" - "github.com/pkg/errors" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" ) diff --git a/client/task_inspect_test.go b/client/task_inspect_test.go index 01e5deca64..7febd5a2c6 100644 --- a/client/task_inspect_test.go +++ b/client/task_inspect_test.go @@ -4,6 +4,7 @@ import ( "bytes" "context" "encoding/json" + "errors" "fmt" "io" "net/http" @@ -12,7 +13,6 @@ import ( "github.com/docker/docker/api/types/swarm" "github.com/docker/docker/errdefs" - "github.com/pkg/errors" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" ) diff --git a/client/volume_inspect_test.go b/client/volume_inspect_test.go index b98de3c5b8..e5ad8f81f6 100644 --- a/client/volume_inspect_test.go +++ b/client/volume_inspect_test.go @@ -4,6 +4,7 @@ import ( "bytes" "context" "encoding/json" + "errors" "fmt" "io" "net/http" @@ -12,7 +13,6 @@ import ( "github.com/docker/docker/api/types/volume" "github.com/docker/docker/errdefs" - "github.com/pkg/errors" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" )