cli/command/node: 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 <github@gone.nl>

cli/command/node/demote_test.go

@@ -1,13 +1,13 @@
 package node
 
 import (
+	"errors"
 	"io"
 	"testing"
 
 	"github.com/docker/cli/internal/test"
 	"github.com/docker/cli/internal/test/builders"
 	"github.com/docker/docker/api/types/swarm"
-	"github.com/pkg/errors"
 	"gotest.tools/v3/assert"
 )
 
@@ -24,14 +24,14 @@ func TestNodeDemoteErrors(t *testing.T) {
 		{
 			args: []string{"nodeID"},
 			nodeInspectFunc: func() (swarm.Node, []byte, error) {
-				return swarm.Node{}, []byte{}, errors.Errorf("error inspecting the node")
+				return swarm.Node{}, []byte{}, errors.New("error inspecting the node")
 			},
 			expectedError: "error inspecting the node",
 		},
 		{
 			args: []string{"nodeID"},
 			nodeUpdateFunc: func(nodeID string, version swarm.Version, node swarm.NodeSpec) error {
-				return errors.Errorf("error updating the node")
+				return errors.New("error updating the node")
 			},
 			expectedError: "error updating the node",
 		},
@@ -57,7 +57,7 @@ func TestNodeDemoteNoChange(t *testing.T) {
 			},
 			nodeUpdateFunc: func(nodeID string, version swarm.Version, node swarm.NodeSpec) error {
 				if node.Role != swarm.NodeRoleWorker {
-					return errors.Errorf("expected role worker, got %s", node.Role)
+					return errors.New("expected role worker, got " + string(node.Role))
 				}
 				return nil
 			},
@@ -74,7 +74,7 @@ func TestNodeDemoteMultipleNode(t *testing.T) {
 			},
 			nodeUpdateFunc: func(nodeID string, version swarm.Version, node swarm.NodeSpec) error {
 				if node.Role != swarm.NodeRoleWorker {
-					return errors.Errorf("expected role worker, got %s", node.Role)
+					return errors.New("expected role worker, got " + string(node.Role))
 				}
 				return nil
 			},

cli/command/node/inspect_test.go

@@ -1,6 +1,7 @@
 package node
 
 import (
+	"errors"
 	"fmt"
 	"io"
 	"testing"
@@ -9,7 +10,6 @@ import (
 	"github.com/docker/cli/internal/test/builders"
 	"github.com/docker/docker/api/types/swarm"
 	"github.com/docker/docker/api/types/system"
-	"github.com/pkg/errors"
 	"gotest.tools/v3/assert"
 	"gotest.tools/v3/golden"
 )
@@ -28,24 +28,24 @@ func TestNodeInspectErrors(t *testing.T) {
 		{
 			args: []string{"self"},
 			infoFunc: func() (system.Info, error) {
-				return system.Info{}, errors.Errorf("error asking for node info")
+				return system.Info{}, errors.New("error asking for node info")
 			},
 			expectedError: "error asking for node info",
 		},
 		{
 			args: []string{"nodeID"},
 			nodeInspectFunc: func() (swarm.Node, []byte, error) {
-				return swarm.Node{}, []byte{}, errors.Errorf("error inspecting the node")
+				return swarm.Node{}, []byte{}, errors.New("error inspecting the node")
 			},
 			infoFunc: func() (system.Info, error) {
-				return system.Info{}, errors.Errorf("error asking for node info")
+				return system.Info{}, errors.New("error asking for node info")
 			},
 			expectedError: "error inspecting the node",
 		},
 		{
 			args: []string{"self"},
 			nodeInspectFunc: func() (swarm.Node, []byte, error) {
-				return swarm.Node{}, []byte{}, errors.Errorf("error inspecting the node")
+				return swarm.Node{}, []byte{}, errors.New("error inspecting the node")
 			},
 			infoFunc: func() (system.Info, error) {
 				return system.Info{Swarm: swarm.Info{NodeID: "abc"}}, nil
@@ -58,7 +58,7 @@ func TestNodeInspectErrors(t *testing.T) {
 				"pretty": "true",
 			},
 			infoFunc: func() (system.Info, error) {
-				return system.Info{}, errors.Errorf("error asking for node info")
+				return system.Info{}, errors.New("error asking for node info")
 			},
 			expectedError: "error asking for node info",
 		},

cli/command/node/list_test.go

@@ -1,6 +1,7 @@
 package node
 
 import (
+	"errors"
 	"io"
 	"testing"
 
@@ -9,7 +10,6 @@ import (
 	"github.com/docker/cli/internal/test/builders"
 	"github.com/docker/docker/api/types/swarm"
 	"github.com/docker/docker/api/types/system"
-	"github.com/pkg/errors"
 	"gotest.tools/v3/assert"
 	is "gotest.tools/v3/assert/cmp"
 	"gotest.tools/v3/golden"
@@ -23,7 +23,7 @@ func TestNodeListErrorOnAPIFailure(t *testing.T) {
 	}{
 		{
 			nodeListFunc: func() ([]swarm.Node, error) {
-				return []swarm.Node{}, errors.Errorf("error listing nodes")
+				return []swarm.Node{}, errors.New("error listing nodes")
 			},
 			expectedError: "error listing nodes",
 		},
@@ -36,7 +36,7 @@ func TestNodeListErrorOnAPIFailure(t *testing.T) {
 				}, nil
 			},
 			infoFunc: func() (system.Info, error) {
-				return system.Info{}, errors.Errorf("error asking for node info")
+				return system.Info{}, errors.New("error asking for node info")
 			},
 			expectedError: "error asking for node info",
 		},

cli/command/node/promote_test.go

@@ -1,13 +1,13 @@
 package node
 
 import (
+	"errors"
 	"io"
 	"testing"
 
 	"github.com/docker/cli/internal/test"
 	"github.com/docker/cli/internal/test/builders"
 	"github.com/docker/docker/api/types/swarm"
-	"github.com/pkg/errors"
 	"gotest.tools/v3/assert"
 )
 
@@ -24,14 +24,14 @@ func TestNodePromoteErrors(t *testing.T) {
 		{
 			args: []string{"nodeID"},
 			nodeInspectFunc: func() (swarm.Node, []byte, error) {
-				return swarm.Node{}, []byte{}, errors.Errorf("error inspecting the node")
+				return swarm.Node{}, []byte{}, errors.New("error inspecting the node")
 			},
 			expectedError: "error inspecting the node",
 		},
 		{
 			args: []string{"nodeID"},
 			nodeUpdateFunc: func(nodeID string, version swarm.Version, node swarm.NodeSpec) error {
-				return errors.Errorf("error updating the node")
+				return errors.New("error updating the node")
 			},
 			expectedError: "error updating the node",
 		},
@@ -57,7 +57,7 @@ func TestNodePromoteNoChange(t *testing.T) {
 			},
 			nodeUpdateFunc: func(nodeID string, version swarm.Version, node swarm.NodeSpec) error {
 				if node.Role != swarm.NodeRoleManager {
-					return errors.Errorf("expected role manager, got %s", node.Role)
+					return errors.New("expected role manager, got" + string(node.Role))
 				}
 				return nil
 			},
@@ -74,7 +74,7 @@ func TestNodePromoteMultipleNode(t *testing.T) {
 			},
 			nodeUpdateFunc: func(nodeID string, version swarm.Version, node swarm.NodeSpec) error {
 				if node.Role != swarm.NodeRoleManager {
-					return errors.Errorf("expected role manager, got %s", node.Role)
+					return errors.New("expected role manager, got" + string(node.Role))
 				}
 				return nil
 			},

cli/command/node/ps_test.go

@@ -2,6 +2,7 @@ package node
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"io"
 	"testing"
@@ -12,7 +13,6 @@ import (
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/swarm"
 	"github.com/docker/docker/api/types/system"
-	"github.com/pkg/errors"
 	"gotest.tools/v3/assert"
 	"gotest.tools/v3/golden"
 )
@@ -29,21 +29,21 @@ func TestNodePsErrors(t *testing.T) {
 	}{
 		{
 			infoFunc: func() (system.Info, error) {
-				return system.Info{}, errors.Errorf("error asking for node info")
+				return system.Info{}, errors.New("error asking for node info")
 			},
 			expectedError: "error asking for node info",
 		},
 		{
 			args: []string{"nodeID"},
 			nodeInspectFunc: func() (swarm.Node, []byte, error) {
-				return swarm.Node{}, []byte{}, errors.Errorf("error inspecting the node")
+				return swarm.Node{}, []byte{}, errors.New("error inspecting the node")
 			},
 			expectedError: "error inspecting the node",
 		},
 		{
 			args: []string{"nodeID"},
 			taskListFunc: func(options types.TaskListOptions) ([]swarm.Task, error) {
-				return []swarm.Task{}, errors.Errorf("error returning the task list")
+				return []swarm.Task{}, errors.New("error returning the task list")
 			},
 			expectedError: "error returning the task list",
 		},

cli/command/node/remove_test.go

@@ -1,11 +1,11 @@
 package node
 
 import (
+	"errors"
 	"io"
 	"testing"
 
 	"github.com/docker/cli/internal/test"
-	"github.com/pkg/errors"
 	"gotest.tools/v3/assert"
 )
 
@@ -21,7 +21,7 @@ func TestNodeRemoveErrors(t *testing.T) {
 		{
 			args: []string{"nodeID"},
 			nodeRemoveFunc: func() error {
-				return errors.Errorf("error removing the node")
+				return errors.New("error removing the node")
 			},
 			expectedError: "error removing the node",
 		},

cli/command/node/update_test.go

@@ -1,13 +1,14 @@
 package node
 
 import (
+	"errors"
+	"fmt"
 	"io"
 	"testing"
 
 	"github.com/docker/cli/internal/test"
 	"github.com/docker/cli/internal/test/builders"
 	"github.com/docker/docker/api/types/swarm"
-	"github.com/pkg/errors"
 	"gotest.tools/v3/assert"
 )
 
@@ -29,14 +30,14 @@ func TestNodeUpdateErrors(t *testing.T) {
 		{
 			args: []string{"nodeID"},
 			nodeInspectFunc: func() (swarm.Node, []byte, error) {
-				return swarm.Node{}, []byte{}, errors.Errorf("error inspecting the node")
+				return swarm.Node{}, []byte{}, errors.New("error inspecting the node")
 			},
 			expectedError: "error inspecting the node",
 		},
 		{
 			args: []string{"nodeID"},
 			nodeUpdateFunc: func(nodeID string, version swarm.Version, node swarm.NodeSpec) error {
-				return errors.Errorf("error updating the node")
+				return errors.New("error updating the node")
 			},
 			expectedError: "error updating the node",
 		},
@@ -86,7 +87,7 @@ func TestNodeUpdate(t *testing.T) {
 			},
 			nodeUpdateFunc: func(nodeID string, version swarm.Version, node swarm.NodeSpec) error {
 				if node.Role != swarm.NodeRoleManager {
-					return errors.Errorf("expected role manager, got %s", node.Role)
+					return errors.New("expected role manager, got " + string(node.Role))
 				}
 				return nil
 			},
@@ -101,7 +102,7 @@ func TestNodeUpdate(t *testing.T) {
 			},
 			nodeUpdateFunc: func(nodeID string, version swarm.Version, node swarm.NodeSpec) error {
 				if node.Availability != swarm.NodeAvailabilityDrain {
-					return errors.Errorf("expected drain availability, got %s", node.Availability)
+					return errors.New("expected drain availability, got " + string(node.Availability))
 				}
 				return nil
 			},
@@ -116,7 +117,7 @@ func TestNodeUpdate(t *testing.T) {
 			},
 			nodeUpdateFunc: func(nodeID string, version swarm.Version, node swarm.NodeSpec) error {
 				if _, present := node.Annotations.Labels["lbl"]; !present {
-					return errors.Errorf("expected 'lbl' label, got %v", node.Annotations.Labels)
+					return fmt.Errorf("expected 'lbl' label, got %v", node.Annotations.Labels)
 				}
 				return nil
 			},
@@ -131,7 +132,7 @@ func TestNodeUpdate(t *testing.T) {
 			},
 			nodeUpdateFunc: func(nodeID string, version swarm.Version, node swarm.NodeSpec) error {
 				if value, present := node.Annotations.Labels["key"]; !present || value != "value" {
-					return errors.Errorf("expected 'key' label to be 'value', got %v", node.Annotations.Labels)
+					return fmt.Errorf("expected 'key' label to be 'value', got %v", node.Annotations.Labels)
 				}
 				return nil
 			},
@@ -148,7 +149,7 @@ func TestNodeUpdate(t *testing.T) {
 			},
 			nodeUpdateFunc: func(nodeID string, version swarm.Version, node swarm.NodeSpec) error {
 				if len(node.Annotations.Labels) > 0 {
-					return errors.Errorf("expected no labels, got %v", node.Annotations.Labels)
+					return fmt.Errorf("expected no labels, got %v", node.Annotations.Labels)
 				}
 				return nil
 			},