1. docker
  2. Commit de10c7d0136dc054abdb40ca624211c04334bdc0
Browse code

client: reduce string-matching in tests

These checks were redundant, as we were not expecting
a specific string, just that a server-error or authentication
error was returned.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Sebastiaan van Stijn authored on 2019/10/13 07:31:53
Showing 91 changed files
client/checkpoint_create_test.go
History View file @ de10c7d
... ... 
@@ -23,11 +23,8 @@ func TestCheckpointCreateError(t *testing.T) {
23 23 
 		Exit:         true,
24 24 
 	})
25 25
26 
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
27 
-		t.Fatalf("expected a Server Error, got %v", err)
28 
-	}
29 26 
 	if !errdefs.IsSystem(err) {
30 
-		t.Fatalf("expected a Server Error, got %T", err)
27 
+		t.Fatalf("expected a Server Error, got %[1]T: %[1]v", err)
31 28 
 	}
32 29 
 }
33 30
client/checkpoint_delete_test.go
History View file @ de10c7d
... ... 
@@ -22,11 +22,8 @@ func TestCheckpointDeleteError(t *testing.T) {
22 22 
 		CheckpointID: "checkpoint_id",
23 23 
 	})
24 24
25 
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
26 
-		t.Fatalf("expected a Server Error, got %v", err)
27 
-	}
28 25 
 	if !errdefs.IsSystem(err) {
29 
-		t.Fatalf("expected a Server Error, got %T", err)
26 
+		t.Fatalf("expected a Server Error, got %[1]T: %[1]v", err)
30 27 
 	}
31 28 
 }
32 29
client/checkpoint_list_test.go
History View file @ de10c7d
... ... 
@@ -20,11 +20,8 @@ func TestCheckpointListError(t *testing.T) {
20 20 
 	}
21 21
22 22 
 	_, err := client.CheckpointList(context.Background(), "container_id", types.CheckpointListOptions{})
23 
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
24 
-		t.Fatalf("expected a Server Error, got %v", err)
25 
-	}
26 23 
 	if !errdefs.IsSystem(err) {
27 
-		t.Fatalf("expected a Server Error, got %T", err)
24 
+		t.Fatalf("expected a Server Error, got %[1]T: %[1]v", err)
28 25 
 	}
29 26 
 }
30 27
client/config_create_test.go
History View file @ de10c7d
... ... 
@@ -32,11 +32,8 @@ func TestConfigCreateError(t *testing.T) {
32 32 
 		client:  newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
33 33 
 	}
34 34 
 	_, err := client.ConfigCreate(context.Background(), swarm.ConfigSpec{})
35 
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
36 
-		t.Fatalf("expected a Server Error, got %v", err)
37 
-	}
38 35 
 	if !errdefs.IsSystem(err) {
39 
-		t.Fatalf("expected a Server Error, got %T", err)
36 
+		t.Fatalf("expected a Server Error, got %[1]T: %[1]v", err)
40 37 
 	}
41 38 
 }
42 39
client/config_inspect_test.go
History View file @ de10c7d
... ... 
@@ -56,11 +56,8 @@ func TestConfigInspectError(t *testing.T) {
56 56 
 	}
57 57
58 58 
 	_, _, err := client.ConfigInspectWithRaw(context.Background(), "nothing")
59 
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
60 
-		t.Fatalf("expected a Server Error, got %v", err)
61 
-	}
62 59 
 	if !errdefs.IsSystem(err) {
63 
-		t.Fatalf("expected a Server Error, got %T", err)
60 
+		t.Fatalf("expected a Server Error, got %[1]T: %[1]v", err)
64 61 
 	}
65 62 
 }
66 63
client/config_list_test.go
History View file @ de10c7d
... ... 
@@ -34,11 +34,8 @@ func TestConfigListError(t *testing.T) {
34 34 
 	}
35 35
36 36 
 	_, err := client.ConfigList(context.Background(), types.ConfigListOptions{})
37 
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
38 
-		t.Fatalf("expected a Server Error, got %v", err)
39 
-	}
40 37 
 	if !errdefs.IsSystem(err) {
41 
-		t.Fatalf("expected a Server Error, got %T", err)
38 
+		t.Fatalf("expected a Server Error, got %[1]T: %[1]v", err)
42 39 
 	}
43 40 
 }
44 41
client/config_remove_test.go
History View file @ de10c7d
... ... 
@@ -30,11 +30,8 @@ func TestConfigRemoveError(t *testing.T) {
30 30 
 	}
31 31
32 32 
 	err := client.ConfigRemove(context.Background(), "config_id")
33 
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
34 
-		t.Fatalf("expected a Server Error, got %v", err)
35 
-	}
36 33 
 	if !errdefs.IsSystem(err) {
37 
-		t.Fatalf("expected a Server Error, got %T", err)
34 
+		t.Fatalf("expected a Server Error, got %[1]T: %[1]v", err)
38 35 
 	}
39 36 
 }
40 37
client/config_update_test.go
History View file @ de10c7d
... ... 
@@ -31,11 +31,8 @@ func TestConfigUpdateError(t *testing.T) {
31 31 
 	}
32 32
33 33 
 	err := client.ConfigUpdate(context.Background(), "config_id", swarm.Version{}, swarm.ConfigSpec{})
34 
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
35 
-		t.Fatalf("expected a Server Error, got %v", err)
36 
-	}
37 34 
 	if !errdefs.IsSystem(err) {
38 
-		t.Fatalf("expected a Server Error, got %T", err)
35 
+		t.Fatalf("expected a Server Error, got %[1]T: %[1]v", err)
39 36 
 	}
40 37 
 }
41 38
client/container_commit_test.go
History View file @ de10c7d
... ... 
@@ -19,11 +19,8 @@ func TestContainerCommitError(t *testing.T) {
19 19 
 		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
20 20 
 	}
21 21 
 	_, err := client.ContainerCommit(context.Background(), "nothing", types.ContainerCommitOptions{})
22 
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
23 
-		t.Fatalf("expected a Server Error, got %v", err)
24 
-	}
25 22 
 	if !errdefs.IsSystem(err) {
26 
-		t.Fatalf("expected a Server Error, got %T", err)
23 
+		t.Fatalf("expected a Server Error, got %[1]T: %[1]v", err)
27 24 
 	}
28 25 
 }
29 26
client/container_copy_test.go
History View file @ de10c7d
... ... 
@@ -20,11 +20,8 @@ func TestContainerStatPathError(t *testing.T) {
20 20 
 		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
21 21 
 	}
22 22 
 	_, err := client.ContainerStatPath(context.Background(), "container_id", "path")
23 
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
24 
-		t.Fatalf("expected a Server error, got %v", err)
25 
-	}
26 23 
 	if !errdefs.IsSystem(err) {
27 
-		t.Fatalf("expected a Server Error, got %T", err)
24 
+		t.Fatalf("expected a Server Error, got %[1]T: %[1]v", err)
28 25 
 	}
29 26 
 }
30 27
... ... 
@@ -103,11 +100,8 @@ func TestCopyToContainerError(t *testing.T) {
103 103 
 		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
104 104 
 	}
105 105 
 	err := client.CopyToContainer(context.Background(), "container_id", "path/to/file", bytes.NewReader([]byte("")), types.CopyToContainerOptions{})
106 
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
107 
-		t.Fatalf("expected a Server error, got %v", err)
108 
-	}
109 106 
 	if !errdefs.IsSystem(err) {
110 
-		t.Fatalf("expected a Server Error, got %T", err)
107 
+		t.Fatalf("expected a Server Error, got %[1]T: %[1]v", err)
111 108 
 	}
112 109 
 }
113 110
... ... 
@@ -183,11 +177,8 @@ func TestCopyFromContainerError(t *testing.T) {
183 183 
 		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
184 184 
 	}
185 185 
 	_, _, err := client.CopyFromContainer(context.Background(), "container_id", "path/to/file")
186 
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
187 
-		t.Fatalf("expected a Server error, got %v", err)
188 
-	}
189 186 
 	if !errdefs.IsSystem(err) {
190 
-		t.Fatalf("expected a Server Error, got %T", err)
187 
+		t.Fatalf("expected a Server Error, got %[1]T: %[1]v", err)
191 188 
 	}
192 189 
 }
193 190
client/container_create_test.go
History View file @ de10c7d
... ... 
@@ -19,9 +19,6 @@ func TestContainerCreateError(t *testing.T) {
19 19 
 		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
20 20 
 	}
21 21 
 	_, err := client.ContainerCreate(context.Background(), nil, nil, nil, "nothing")
22 
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
23 
-		t.Fatalf("expected a Server Error while testing StatusInternalServerError, got %v", err)
24 
-	}
25 22 
 	if !errdefs.IsSystem(err) {
26 23 
 		t.Fatalf("expected a Server Error while testing StatusInternalServerError, got %T", err)
27 24 
 	}
... ... 
@@ -31,9 +28,6 @@ func TestContainerCreateError(t *testing.T) {
31 31 
 		client: newMockClient(errorMock(http.StatusNotFound, "Server error")),
32 32 
 	}
33 33 
 	_, err = client.ContainerCreate(context.Background(), nil, nil, nil, "nothing")
34 
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
35 
-		t.Fatalf("expected a Server Error while testing StatusNotFound, got %v", err)
36 
-	}
37 34 
 	if err == nil || !IsErrNotFound(err) {
38 35 
 		t.Fatalf("expected a Server Error while testing StatusNotFound, got %T", err)
39 36 
 	}
client/container_diff_test.go
History View file @ de10c7d
... ... 
@@ -19,11 +19,8 @@ func TestContainerDiffError(t *testing.T) {
19 19 
 		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
20 20 
 	}
21 21 
 	_, err := client.ContainerDiff(context.Background(), "nothing")
22 
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
23 
-		t.Fatalf("expected a Server Error, got %v", err)
24 
-	}
25 22 
 	if !errdefs.IsSystem(err) {
26 
-		t.Fatalf("expected a Server Error, got %T", err)
23 
+		t.Fatalf("expected a Server Error, got %[1]T: %[1]v", err)
27 24 
 	}
28 25 
 }
29 26
client/container_exec_test.go
History View file @ de10c7d
... ... 
@@ -19,11 +19,8 @@ func TestContainerExecCreateError(t *testing.T) {
19 19 
 		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
20 20 
 	}
21 21 
 	_, err := client.ContainerExecCreate(context.Background(), "container_id", types.ExecConfig{})
22 
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
23 
-		t.Fatalf("expected a Server Error, got %v", err)
24 
-	}
25 22 
 	if !errdefs.IsSystem(err) {
26 
-		t.Fatalf("expected a Server Error, got %T", err)
23 
+		t.Fatalf("expected a Server Error, got %[1]T: %[1]v", err)
27 24 
 	}
28 25 
 }
29 26
... ... 
@@ -77,11 +74,8 @@ func TestContainerExecStartError(t *testing.T) {
77 77 
 		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
78 78 
 	}
79 79 
 	err := client.ContainerExecStart(context.Background(), "nothing", types.ExecStartCheck{})
80 
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
81 
-		t.Fatalf("expected a Server Error, got %v", err)
82 
-	}
83 80 
 	if !errdefs.IsSystem(err) {
84 
-		t.Fatalf("expected a Server Error, got %T", err)
81 
+		t.Fatalf("expected a Server Error, got %[1]T: %[1]v", err)
85 82 
 	}
86 83 
 }
87 84
... ... 
@@ -124,11 +118,8 @@ func TestContainerExecInspectError(t *testing.T) {
124 124 
 		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
125 125 
 	}
126 126 
 	_, err := client.ContainerExecInspect(context.Background(), "nothing")
127 
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
128 
-		t.Fatalf("expected a Server Error, got %v", err)
129 
-	}
130 127 
 	if !errdefs.IsSystem(err) {
131 
-		t.Fatalf("expected a Server Error, got %T", err)
128 
+		t.Fatalf("expected a Server Error, got %[1]T: %[1]v", err)
132 129 
 	}
133 130 
 }
134 131
client/container_export_test.go
History View file @ de10c7d
... ... 
@@ -17,11 +17,8 @@ func TestContainerExportError(t *testing.T) {
17 17 
 		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
18 18 
 	}
19 19 
 	_, err := client.ContainerExport(context.Background(), "nothing")
20 
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
21 
-		t.Fatalf("expected a Server Error, got %v", err)
22 
-	}
23 20 
 	if !errdefs.IsSystem(err) {
24 
-		t.Fatalf("expected a Server Error, got %T", err)
21 
+		t.Fatalf("expected a Server Error, got %[1]T: %[1]v", err)
25 22 
 	}
26 23 
 }
27 24
client/container_inspect_test.go
History View file @ de10c7d
... ... 
@@ -21,11 +21,8 @@ func TestContainerInspectError(t *testing.T) {
21 21 
 	}
22 22
23 23 
 	_, err := client.ContainerInspect(context.Background(), "nothing")
24 
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
25 
-		t.Fatalf("expected a Server Error, got %v", err)
26 
-	}
27 24 
 	if !errdefs.IsSystem(err) {
28 
-		t.Fatalf("expected a Server Error, got %T", err)
25 
+		t.Fatalf("expected a Server Error, got %[1]T: %[1]v", err)
29 26 
 	}
30 27 
 }
31 28
client/container_kill_test.go
History View file @ de10c7d
... ... 
@@ -17,11 +17,8 @@ func TestContainerKillError(t *testing.T) {
17 17 
 		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
18 18 
 	}
19 19 
 	err := client.ContainerKill(context.Background(), "nothing", "SIGKILL")
20 
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
21 
-		t.Fatalf("expected a Server Error, got %v", err)
22 
-	}
23 20 
 	if !errdefs.IsSystem(err) {
24 
-		t.Fatalf("expected a Server Error, got %T", err)
21 
+		t.Fatalf("expected a Server Error, got %[1]T: %[1]v", err)
25 22 
 	}
26 23 
 }
27 24
client/container_list_test.go
History View file @ de10c7d
... ... 
@@ -20,11 +20,8 @@ func TestContainerListError(t *testing.T) {
20 20 
 		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
21 21 
 	}
22 22 
 	_, err := client.ContainerList(context.Background(), types.ContainerListOptions{})
23 
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
24 
-		t.Fatalf("expected a Server Error, got %v", err)
25 
-	}
26 23 
 	if !errdefs.IsSystem(err) {
27 
-		t.Fatalf("expected a Server Error, got %T", err)
24 
+		t.Fatalf("expected a Server Error, got %[1]T: %[1]v", err)
28 25 
 	}
29 26 
 }
30 27
client/container_logs_test.go
History View file @ de10c7d
... ... 
@@ -14,6 +14,7 @@ import (
14 14 
 	"time"
15 15
16 16 
 	"github.com/docker/docker/api/types"
17 
+	"github.com/docker/docker/errdefs"
17 18 
 	"gotest.tools/assert"
18 19 
 	is "gotest.tools/assert/cmp"
19 20 
 )
... ... 
@@ -33,7 +34,9 @@ func TestContainerLogsError(t *testing.T) {
33 33 
 		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
34 34 
 	}
35 35 
 	_, err := client.ContainerLogs(context.Background(), "container_id", types.ContainerLogsOptions{})
36 
-	assert.Check(t, is.Error(err, "Error response from daemon: Server error"))
36 
+	if !errdefs.IsSystem(err) {
37 
+		t.Fatalf("expected a Server Error, got %[1]T: %[1]v", err)
38 
+	}
37 39 
 	_, err = client.ContainerLogs(context.Background(), "container_id", types.ContainerLogsOptions{
38 40 
 		Since: "2006-01-02TZ",
39 41 
 	})
client/container_pause_test.go
History View file @ de10c7d
... ... 
@@ -17,11 +17,8 @@ func TestContainerPauseError(t *testing.T) {
17 17 
 		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
18 18 
 	}
19 19 
 	err := client.ContainerPause(context.Background(), "nothing")
20 
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
21 
-		t.Fatalf("expected a Server Error, got %v", err)
22 
-	}
23 20 
 	if !errdefs.IsSystem(err) {
24 
-		t.Fatalf("expected a Server Error, got %T", err)
21 
+		t.Fatalf("expected a Server Error, got %[1]T: %[1]v", err)
25 22 
 	}
26 23 
 }
27 24
client/container_prune_test.go
History View file @ de10c7d
... ... 
@@ -12,6 +12,7 @@ import (
12 12
13 13 
 	"github.com/docker/docker/api/types"
14 14 
 	"github.com/docker/docker/api/types/filters"
15 
+	"github.com/docker/docker/errdefs"
15 16 
 	"gotest.tools/assert"
16 17 
 	is "gotest.tools/assert/cmp"
17 18 
 )
... ... 
@@ -25,7 +26,9 @@ func TestContainersPruneError(t *testing.T) {
25 25 
 	filters := filters.NewArgs()
26 26
27 27 
 	_, err := client.ContainersPrune(context.Background(), filters)
28 
-	assert.Check(t, is.Error(err, "Error response from daemon: Server error"))
28 
+	if !errdefs.IsSystem(err) {
29 
+		t.Fatalf("expected a Server Error, got %[1]T: %[1]v", err)
30 
+	}
29 31 
 }
30 32
31 33 
 func TestContainersPrune(t *testing.T) {
client/container_remove_test.go
History View file @ de10c7d
... ... 
@@ -10,6 +10,7 @@ import (
10 10 
 	"testing"
11 11
12 12 
 	"github.com/docker/docker/api/types"
13 
+	"github.com/docker/docker/errdefs"
13 14 
 	"gotest.tools/assert"
14 15 
 	is "gotest.tools/assert/cmp"
15 16 
 )
... ... 
@@ -19,7 +20,9 @@ func TestContainerRemoveError(t *testing.T) {
19 19 
 		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
20 20 
 	}
21 21 
 	err := client.ContainerRemove(context.Background(), "container_id", types.ContainerRemoveOptions{})
22 
-	assert.Check(t, is.Error(err, "Error response from daemon: Server error"))
22 
+	if !errdefs.IsSystem(err) {
23 
+		t.Fatalf("expected a Server Error, got %[1]T: %[1]v", err)
24 
+	}
23 25 
 }
24 26
25 27 
 func TestContainerRemoveNotFoundError(t *testing.T) {
client/container_rename_test.go
History View file @ de10c7d
... ... 
@@ -17,11 +17,8 @@ func TestContainerRenameError(t *testing.T) {
17 17 
 		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
18 18 
 	}
19 19 
 	err := client.ContainerRename(context.Background(), "nothing", "newNothing")
20 
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
21 
-		t.Fatalf("expected a Server Error, got %v", err)
22 
-	}
23 20 
 	if !errdefs.IsSystem(err) {
24 
-		t.Fatalf("expected a Server Error, got %T", err)
21 
+		t.Fatalf("expected a Server Error, got %[1]T: %[1]v", err)
25 22 
 	}
26 23 
 }
27 24
client/container_resize_test.go
History View file @ de10c7d
... ... 
@@ -18,11 +18,8 @@ func TestContainerResizeError(t *testing.T) {
18 18 
 		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
19 19 
 	}
20 20 
 	err := client.ContainerResize(context.Background(), "container_id", types.ResizeOptions{})
21 
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
22 
-		t.Fatalf("expected a Server Error, got %v", err)
23 
-	}
24 21 
 	if !errdefs.IsSystem(err) {
25 
-		t.Fatalf("expected a Server Error, got %T", err)
22 
+		t.Fatalf("expected a Server Error, got %[1]T: %[1]v", err)
26 23 
 	}
27 24 
 }
28 25
... ... 
@@ -31,11 +28,8 @@ func TestContainerExecResizeError(t *testing.T) {
31 31 
 		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
32 32 
 	}
33 33 
 	err := client.ContainerExecResize(context.Background(), "exec_id", types.ResizeOptions{})
34 
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
35 
-		t.Fatalf("expected a Server Error, got %v", err)
36 
-	}
37 34 
 	if !errdefs.IsSystem(err) {
38 
-		t.Fatalf("expected a Server Error, got %T", err)
35 
+		t.Fatalf("expected a Server Error, got %[1]T: %[1]v", err)
39 36 
 	}
40 37 
 }
41 38
client/container_restart_test.go
History View file @ de10c7d
... ... 
@@ -19,11 +19,8 @@ func TestContainerRestartError(t *testing.T) {
19 19 
 	}
20 20 
 	timeout := 0 * time.Second
21 21 
 	err := client.ContainerRestart(context.Background(), "nothing", &timeout)
22 
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
23 
-		t.Fatalf("expected a Server Error, got %v", err)
24 
-	}
25 22 
 	if !errdefs.IsSystem(err) {
26 
-		t.Fatalf("expected a Server Error, got %T", err)
23 
+		t.Fatalf("expected a Server Error, got %[1]T: %[1]v", err)
27 24 
 	}
28 25 
 }
29 26
client/container_start_test.go
History View file @ de10c7d
... ... 
@@ -19,11 +19,8 @@ func TestContainerStartError(t *testing.T) {
19 19 
 		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
20 20 
 	}
21 21 
 	err := client.ContainerStart(context.Background(), "nothing", types.ContainerStartOptions{})
22 
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
23 
-		t.Fatalf("expected a Server Error, got %v", err)
24 
-	}
25 22 
 	if !errdefs.IsSystem(err) {
26 
-		t.Fatalf("expected a Server Error, got %T", err)
23 
+		t.Fatalf("expected a Server Error, got %[1]T: %[1]v", err)
27 24 
 	}
28 25 
 }
29 26
client/container_stats_test.go
History View file @ de10c7d
... ... 
@@ -17,11 +17,8 @@ func TestContainerStatsError(t *testing.T) {
17 17 
 		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
18 18 
 	}
19 19 
 	_, err := client.ContainerStats(context.Background(), "nothing", false)
20 
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
21 
-		t.Fatalf("expected a Server Error, got %v", err)
22 
-	}
23 20 
 	if !errdefs.IsSystem(err) {
24 
-		t.Fatalf("expected a Server Error, got %T", err)
21 
+		t.Fatalf("expected a Server Error, got %[1]T: %[1]v", err)
25 22 
 	}
26 23 
 }
27 24
client/container_stop_test.go
History View file @ de10c7d
... ... 
@@ -19,11 +19,8 @@ func TestContainerStopError(t *testing.T) {
19 19 
 	}
20 20 
 	timeout := 0 * time.Second
21 21 
 	err := client.ContainerStop(context.Background(), "nothing", &timeout)
22 
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
23 
-		t.Fatalf("expected a Server Error, got %v", err)
24 
-	}
25 22 
 	if !errdefs.IsSystem(err) {
26 
-		t.Fatalf("expected a Server Error, got %T", err)
23 
+		t.Fatalf("expected a Server Error, got %[1]T: %[1]v", err)
27 24 
 	}
28 25 
 }
29 26
client/container_top_test.go
History View file @ de10c7d
... ... 
@@ -20,11 +20,8 @@ func TestContainerTopError(t *testing.T) {
20 20 
 		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
21 21 
 	}
22 22 
 	_, err := client.ContainerTop(context.Background(), "nothing", []string{})
23 
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
24 
-		t.Fatalf("expected a Server Error, got %v", err)
25 
-	}
26 23 
 	if !errdefs.IsSystem(err) {
27 
-		t.Fatalf("expected a Server Error, got %T", err)
24 
+		t.Fatalf("expected a Server Error, got %[1]T: %[1]v", err)
28 25 
 	}
29 26 
 }
30 27
client/container_unpause_test.go
History View file @ de10c7d
... ... 
@@ -17,11 +17,8 @@ func TestContainerUnpauseError(t *testing.T) {
17 17 
 		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
18 18 
 	}
19 19 
 	err := client.ContainerUnpause(context.Background(), "nothing")
20 
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
21 
-		t.Fatalf("expected a Server Error, got %v", err)
22 
-	}
23 20 
 	if !errdefs.IsSystem(err) {
24 
-		t.Fatalf("expected a Server Error, got %T", err)
21 
+		t.Fatalf("expected a Server Error, got %[1]T: %[1]v", err)
25 22 
 	}
26 23 
 }
27 24
client/container_update_test.go
History View file @ de10c7d
... ... 
@@ -19,11 +19,8 @@ func TestContainerUpdateError(t *testing.T) {
19 19 
 		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
20 20 
 	}
21 21 
 	_, err := client.ContainerUpdate(context.Background(), "nothing", container.UpdateConfig{})
22 
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
23 
-		t.Fatalf("expected a Server Error, got %v", err)
24 
-	}
25 22 
 	if !errdefs.IsSystem(err) {
26 
-		t.Fatalf("expected a Server Error, got %T", err)
23 
+		t.Fatalf("expected a Server Error, got %[1]T: %[1]v", err)
27 24 
 	}
28 25 
 }
29 26
client/container_wait_test.go
History View file @ de10c7d
... ... 
@@ -25,11 +25,8 @@ func TestContainerWaitError(t *testing.T) {
25 25 
 	case result := <-resultC:
26 26 
 		t.Fatalf("expected to not get a wait result, got %d", result.StatusCode)
27 27 
 	case err := <-errC:
28 
-		if err.Error() != "Error response from daemon: Server error" {
29 
-			t.Fatalf("expected a Server Error, got %v", err)
30 
-		}
31 28 
 		if !errdefs.IsSystem(err) {
32 
-			t.Fatalf("expected a Server Error, got %T", err)
29 
+			t.Fatalf("expected a Server Error, got %[1]T: %[1]v", err)
33 30 
 		}
34 31 
 	}
35 32 
 }
client/disk_usage_test.go
History View file @ de10c7d
... ... 
@@ -19,11 +19,8 @@ func TestDiskUsageError(t *testing.T) {
19 19 
 		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
20 20 
 	}
21 21 
 	_, err := client.DiskUsage(context.Background())
22 
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
23 
-		t.Fatalf("expected a Server Error, got %v", err)
24 
-	}
25 22 
 	if !errdefs.IsSystem(err) {
26 
-		t.Fatalf("expected a Server Error, got %T", err)
23 
+		t.Fatalf("expected a Server Error, got %[1]T: %[1]v", err)
27 24 
 	}
28 25 
 }
29 26
client/events_test.go
History View file @ de10c7d
... ... 
@@ -53,11 +53,8 @@ func TestEventsErrorFromServer(t *testing.T) {
53 53 
 	}
54 54 
 	_, errs := client.Events(context.Background(), types.EventsOptions{})
55 55 
 	err := <-errs
56 
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
57 
-		t.Fatalf("expected a Server Error, got %v", err)
58 
-	}
59 56 
 	if !errdefs.IsSystem(err) {
60 
-		t.Fatalf("expected a Server Error, got %T", err)
57 
+		t.Fatalf("expected a Server Error, got %[1]T: %[1]v", err)
61 58 
 	}
62 59 
 }
63 60
client/image_build_test.go
History View file @ de10c7d
... ... 
@@ -21,11 +21,8 @@ func TestImageBuildError(t *testing.T) {
21 21 
 		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
22 22 
 	}
23 23 
 	_, err := client.ImageBuild(context.Background(), nil, types.ImageBuildOptions{})
24 
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
25 
-		t.Fatalf("expected a Server Error, got %v", err)
26 
-	}
27 24 
 	if !errdefs.IsSystem(err) {
28 
-		t.Fatalf("expected a Server Error, got %T", err)
25 
+		t.Fatalf("expected a Server Error, got %[1]T: %[1]v", err)
29 26 
 	}
30 27 
 }
31 28
client/image_create_test.go
History View file @ de10c7d
... ... 
@@ -18,11 +18,8 @@ func TestImageCreateError(t *testing.T) {
18 18 
 		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
19 19 
 	}
20 20 
 	_, err := client.ImageCreate(context.Background(), "reference", types.ImageCreateOptions{})
21 
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
22 
-		t.Fatalf("expected a Server error, got %v", err)
23 
-	}
24 21 
 	if !errdefs.IsSystem(err) {
25 
-		t.Fatalf("expected a Server Error, got %T", err)
22 
+		t.Fatalf("expected a Server Error, got %[1]T: %[1]v", err)
26 23 
 	}
27 24 
 }
28 25
client/image_history_test.go
History View file @ de10c7d
... ... 
@@ -19,11 +19,8 @@ func TestImageHistoryError(t *testing.T) {
19 19 
 		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
20 20 
 	}
21 21 
 	_, err := client.ImageHistory(context.Background(), "nothing")
22 
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
23 
-		t.Fatalf("expected a Server error, got %v", err)
24 
-	}
25 22 
 	if !errdefs.IsSystem(err) {
26 
-		t.Fatalf("expected a Server Error, got %T", err)
23 
+		t.Fatalf("expected a Server Error, got %[1]T: %[1]v", err)
27 24 
 	}
28 25 
 }
29 26
client/image_import_test.go
History View file @ de10c7d
... ... 
@@ -19,11 +19,8 @@ func TestImageImportError(t *testing.T) {
19 19 
 		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
20 20 
 	}
21 21 
 	_, err := client.ImageImport(context.Background(), types.ImageImportSource{}, "image:tag", types.ImageImportOptions{})
22 
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
23 
-		t.Fatalf("expected a Server error, got %v", err)
24 
-	}
25 22 
 	if !errdefs.IsSystem(err) {
26 
-		t.Fatalf("expected a Server Error, got %T", err)
23 
+		t.Fatalf("expected a Server Error, got %[1]T: %[1]v", err)
27 24 
 	}
28 25 
 }
29 26
client/image_inspect_test.go
History View file @ de10c7d
... ... 
@@ -22,11 +22,8 @@ func TestImageInspectError(t *testing.T) {
22 22 
 	}
23 23
24 24 
 	_, _, err := client.ImageInspectWithRaw(context.Background(), "nothing")
25 
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
26 
-		t.Fatalf("expected a Server Error, got %v", err)
27 
-	}
28 25 
 	if !errdefs.IsSystem(err) {
29 
-		t.Fatalf("expected a Server Error, got %T", err)
26 
+		t.Fatalf("expected a Server Error, got %[1]T: %[1]v", err)
30 27 
 	}
31 28 
 }
32 29
client/image_list_test.go
History View file @ de10c7d
... ... 
@@ -21,11 +21,8 @@ func TestImageListError(t *testing.T) {
21 21 
 	}
22 22
23 23 
 	_, err := client.ImageList(context.Background(), types.ImageListOptions{})
24 
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
25 
-		t.Fatalf("expected a Server Error, got %v", err)
26 
-	}
27 24 
 	if !errdefs.IsSystem(err) {
28 
-		t.Fatalf("expected a Server Error, got %T", err)
25 
+		t.Fatalf("expected a Server Error, got %[1]T: %[1]v", err)
29 26 
 	}
30 27 
 }
31 28
client/image_load_test.go
History View file @ de10c7d
... ... 
@@ -18,11 +18,8 @@ func TestImageLoadError(t *testing.T) {
18 18 
 	}
19 19
20 20 
 	_, err := client.ImageLoad(context.Background(), nil, true)
21 
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
22 
-		t.Fatalf("expected a Server Error, got %v", err)
23 
-	}
24 21 
 	if !errdefs.IsSystem(err) {
25 
-		t.Fatalf("expected a Server Error, got %T", err)
22 
+		t.Fatalf("expected a Server Error, got %[1]T: %[1]v", err)
26 23 
 	}
27 24 
 }
28 25
client/image_prune_test.go
History View file @ de10c7d
... ... 
@@ -10,6 +10,8 @@ import (
10 10 
 	"strings"
11 11 
 	"testing"
12 12
13 
+	"github.com/docker/docker/errdefs"
14 
+
13 15 
 	"github.com/docker/docker/api/types"
14 16 
 	"github.com/docker/docker/api/types/filters"
15 17 
 	"gotest.tools/assert"
... ... 
@@ -22,10 +24,10 @@ func TestImagesPruneError(t *testing.T) {
22 22 
 		version: "1.25",
23 23 
 	}
24 24
25 
-	filters := filters.NewArgs()
26 
-
27 
-	_, err := client.ImagesPrune(context.Background(), filters)
28 
-	assert.Check(t, is.Error(err, "Error response from daemon: Server error"))
25 
+	_, err := client.ImagesPrune(context.Background(), filters.NewArgs())
26 
+	if !errdefs.IsSystem(err) {
27 
+		t.Fatalf("expected a Server Error, got %[1]T: %[1]v", err)
28 
+	}
29 29 
 }
30 30
31 31 
 func TestImagesPrune(t *testing.T) {
client/image_pull_test.go
History View file @ de10c7d
... ... 
@@ -31,11 +31,8 @@ func TestImagePullAnyError(t *testing.T) {
31 31 
 		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
32 32 
 	}
33 33 
 	_, err := client.ImagePull(context.Background(), "myimage", types.ImagePullOptions{})
34 
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
35 
-		t.Fatalf("expected a Server Error, got %v", err)
36 
-	}
37 34 
 	if !errdefs.IsSystem(err) {
38 
-		t.Fatalf("expected a Server Error, got %T", err)
35 
+		t.Fatalf("expected a Server Error, got %[1]T: %[1]v", err)
39 36 
 	}
40 37 
 }
41 38
... ... 
@@ -44,8 +41,8 @@ func TestImagePullStatusUnauthorizedError(t *testing.T) {
44 44 
 		client: newMockClient(errorMock(http.StatusUnauthorized, "Unauthorized error")),
45 45 
 	}
46 46 
 	_, err := client.ImagePull(context.Background(), "myimage", types.ImagePullOptions{})
47 
-	if err == nil || err.Error() != "Error response from daemon: Unauthorized error" {
48 
-		t.Fatalf("expected an Unauthorized Error, got %v", err)
47 
+	if !errdefs.IsUnauthorized(err) {
48 
+		t.Fatalf("expected a Unauthorized Error, got %[1]T: %[1]v", err)
49 49 
 	}
50 50 
 }
51 51
... ... 
@@ -74,8 +71,8 @@ func TestImagePullWithUnauthorizedErrorAndAnotherUnauthorizedError(t *testing.T)
74 74 
 	_, err := client.ImagePull(context.Background(), "myimage", types.ImagePullOptions{
75 75 
 		PrivilegeFunc: privilegeFunc,
76 76 
 	})
77 
-	if err == nil || err.Error() != "Error response from daemon: Unauthorized error" {
78 
-		t.Fatalf("expected an Unauthorized Error, got %v", err)
77 
+	if !errdefs.IsUnauthorized(err) {
78 
+		t.Fatalf("expected a Unauthorized Error, got %[1]T: %[1]v", err)
79 79 
 	}
80 80 
 }
81 81
client/image_push_test.go
History View file @ de10c7d
... ... 
@@ -36,11 +36,8 @@ func TestImagePushAnyError(t *testing.T) {
36 36 
 		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
37 37 
 	}
38 38 
 	_, err := client.ImagePush(context.Background(), "myimage", types.ImagePushOptions{})
39 
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
40 
-		t.Fatalf("expected a Server Error, got %v", err)
41 
-	}
42 39 
 	if !errdefs.IsSystem(err) {
43 
-		t.Fatalf("expected a Server Error, got %T", err)
40 
+		t.Fatalf("expected a Server Error, got %[1]T: %[1]v", err)
44 41 
 	}
45 42 
 }
46 43
... ... 
@@ -49,8 +46,8 @@ func TestImagePushStatusUnauthorizedError(t *testing.T) {
49 49 
 		client: newMockClient(errorMock(http.StatusUnauthorized, "Unauthorized error")),
50 50 
 	}
51 51 
 	_, err := client.ImagePush(context.Background(), "myimage", types.ImagePushOptions{})
52 
-	if err == nil || err.Error() != "Error response from daemon: Unauthorized error" {
53 
-		t.Fatalf("expected an Unauthorized Error, got %v", err)
52 
+	if !errdefs.IsUnauthorized(err) {
53 
+		t.Fatalf("expected a Unauthorized Error, got %[1]T: %[1]v", err)
54 54 
 	}
55 55 
 }
56 56
... ... 
@@ -79,8 +76,8 @@ func TestImagePushWithUnauthorizedErrorAndAnotherUnauthorizedError(t *testing.T)
79 79 
 	_, err := client.ImagePush(context.Background(), "myimage", types.ImagePushOptions{
80 80 
 		PrivilegeFunc: privilegeFunc,
81 81 
 	})
82 
-	if err == nil || err.Error() != "Error response from daemon: Unauthorized error" {
83 
-		t.Fatalf("expected an Unauthorized Error, got %v", err)
82 
+	if !errdefs.IsUnauthorized(err) {
83 
+		t.Fatalf("expected a Unauthorized Error, got %[1]T: %[1]v", err)
84 84 
 	}
85 85 
 }
86 86
client/image_remove_test.go
History View file @ de10c7d
... ... 
@@ -11,6 +11,7 @@ import (
11 11 
 	"testing"
12 12
13 13 
 	"github.com/docker/docker/api/types"
14 
+	"github.com/docker/docker/errdefs"
14 15 
 	"gotest.tools/assert"
15 16 
 	is "gotest.tools/assert/cmp"
16 17 
 )
... ... 
@@ -21,7 +22,9 @@ func TestImageRemoveError(t *testing.T) {
21 21 
 	}
22 22
23 23 
 	_, err := client.ImageRemove(context.Background(), "image_id", types.ImageRemoveOptions{})
24 
-	assert.Check(t, is.Error(err, "Error response from daemon: Server error"))
24 
+	if !errdefs.IsSystem(err) {
25 
+		t.Fatalf("expected a Server Error, got %[1]T: %[1]v", err)
26 
+	}
25 27 
 }
26 28
27 29 
 func TestImageRemoveImageNotFound(t *testing.T) {
client/image_save_test.go
History View file @ de10c7d
... ... 
@@ -18,11 +18,8 @@ func TestImageSaveError(t *testing.T) {
18 18 
 		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
19 19 
 	}
20 20 
 	_, err := client.ImageSave(context.Background(), []string{"nothing"})
21 
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
22 
-		t.Fatalf("expected a Server error, got %v", err)
23 
-	}
24 21 
 	if !errdefs.IsSystem(err) {
25 
-		t.Fatalf("expected a Server Error, got %T", err)
22 
+		t.Fatalf("expected a Server Error, got %[1]T: %[1]v", err)
26 23 
 	}
27 24 
 }
28 25
client/image_search_test.go
History View file @ de10c7d
... ... 
@@ -21,11 +21,8 @@ func TestImageSearchAnyError(t *testing.T) {
21 21 
 		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
22 22 
 	}
23 23 
 	_, err := client.ImageSearch(context.Background(), "some-image", types.ImageSearchOptions{})
24 
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
25 
-		t.Fatalf("expected a Server Error, got %v", err)
26 
-	}
27 24 
 	if !errdefs.IsSystem(err) {
28 
-		t.Fatalf("expected a Server Error, got %T", err)
25 
+		t.Fatalf("expected a Server Error, got %[1]T: %[1]v", err)
29 26 
 	}
30 27 
 }
31 28
... ... 
@@ -34,8 +31,8 @@ func TestImageSearchStatusUnauthorizedError(t *testing.T) {
34 34 
 		client: newMockClient(errorMock(http.StatusUnauthorized, "Unauthorized error")),
35 35 
 	}
36 36 
 	_, err := client.ImageSearch(context.Background(), "some-image", types.ImageSearchOptions{})
37 
-	if err == nil || err.Error() != "Error response from daemon: Unauthorized error" {
38 
-		t.Fatalf("expected an Unauthorized Error, got %v", err)
37 
+	if !errdefs.IsUnauthorized(err) {
38 
+		t.Fatalf("expected a Unauthorized Error, got %[1]T: %[1]v", err)
39 39 
 	}
40 40 
 }
41 41
... ... 
@@ -64,8 +61,8 @@ func TestImageSearchWithUnauthorizedErrorAndAnotherUnauthorizedError(t *testing.
64 64 
 	_, err := client.ImageSearch(context.Background(), "some-image", types.ImageSearchOptions{
65 65 
 		PrivilegeFunc: privilegeFunc,
66 66 
 	})
67 
-	if err == nil || err.Error() != "Error response from daemon: Unauthorized error" {
68 
-		t.Fatalf("expected an Unauthorized Error, got %v", err)
67 
+	if !errdefs.IsUnauthorized(err) {
68 
+		t.Fatalf("expected a Unauthorized Error, got %[1]T: %[1]v", err)
69 69 
 	}
70 70 
 }
71 71
client/image_tag_test.go
History View file @ de10c7d
... ... 
@@ -18,11 +18,8 @@ func TestImageTagError(t *testing.T) {
18 18 
 	}
19 19
20 20 
 	err := client.ImageTag(context.Background(), "image_id", "repo:tag")
21 
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
22 
-		t.Fatalf("expected a Server Error, got %v", err)
23 
-	}
24 21 
 	if !errdefs.IsSystem(err) {
25 
-		t.Fatalf("expected a Server Error, got %T", err)
22 
+		t.Fatalf("expected a Server Error, got %[1]T: %[1]v", err)
26 23 
 	}
27 24 
 }
28 25
client/info_test.go
History View file @ de10c7d
... ... 
@@ -19,11 +19,8 @@ func TestInfoServerError(t *testing.T) {
19 19 
 		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
20 20 
 	}
21 21 
 	_, err := client.Info(context.Background())
22 
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
23 
-		t.Fatalf("expected a Server Error, got %v", err)
24 
-	}
25 22 
 	if !errdefs.IsSystem(err) {
26 
-		t.Fatalf("expected a Server Error, got %T", err)
23 
+		t.Fatalf("expected a Server Error, got %[1]T: %[1]v", err)
27 24 
 	}
28 25 
 }
29 26
client/network_connect_test.go
History View file @ de10c7d
... ... 
@@ -21,11 +21,8 @@ func TestNetworkConnectError(t *testing.T) {
21 21 
 	}
22 22
23 23 
 	err := client.NetworkConnect(context.Background(), "network_id", "container_id", nil)
24 
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
25 
-		t.Fatalf("expected a Server Error, got %v", err)
26 
-	}
27 24 
 	if !errdefs.IsSystem(err) {
28 
-		t.Fatalf("expected a Server Error, got %T", err)
25 
+		t.Fatalf("expected a Server Error, got %[1]T: %[1]v", err)
29 26 
 	}
30 27 
 }
31 28
client/network_create_test.go
History View file @ de10c7d
... ... 
@@ -20,11 +20,8 @@ func TestNetworkCreateError(t *testing.T) {
20 20 
 	}
21 21
22 22 
 	_, err := client.NetworkCreate(context.Background(), "mynetwork", types.NetworkCreate{})
23 
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
24 
-		t.Fatalf("expected a Server Error, got %v", err)
25 
-	}
26 23 
 	if !errdefs.IsSystem(err) {
27 
-		t.Fatalf("expected a Server Error, got %T", err)
24 
+		t.Fatalf("expected a Server Error, got %[1]T: %[1]v", err)
28 25 
 	}
29 26 
 }
30 27
client/network_disconnect_test.go
History View file @ de10c7d
... ... 
@@ -20,11 +20,8 @@ func TestNetworkDisconnectError(t *testing.T) {
20 20 
 	}
21 21
22 22 
 	err := client.NetworkDisconnect(context.Background(), "network_id", "container_id", false)
23 
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
24 
-		t.Fatalf("expected a Server Error, got %v", err)
25 
-	}
26 23 
 	if !errdefs.IsSystem(err) {
27 
-		t.Fatalf("expected a Server Error, got %T", err)
24 
+		t.Fatalf("expected a Server Error, got %[1]T: %[1]v", err)
28 25 
 	}
29 26 
 }
30 27
client/network_inspect_test.go
History View file @ de10c7d
... ... 
@@ -12,6 +12,7 @@ import (
12 12
13 13 
 	"github.com/docker/docker/api/types"
14 14 
 	"github.com/docker/docker/api/types/network"
15 
+	"github.com/docker/docker/errdefs"
15 16 
 	"github.com/pkg/errors"
16 17 
 	"gotest.tools/assert"
17 18 
 	is "gotest.tools/assert/cmp"
... ... 
@@ -23,7 +24,9 @@ func TestNetworkInspectError(t *testing.T) {
23 23 
 	}
24 24
25 25 
 	_, err := client.NetworkInspect(context.Background(), "nothing", types.NetworkInspectOptions{})
26 
-	assert.Check(t, is.Error(err, "Error response from daemon: Server error"))
26 
+	if !errdefs.IsSystem(err) {
27 
+		t.Fatalf("expected a Server Error, got %[1]T: %[1]v", err)
28 
+	}
27 29 
 }
28 30
29 31 
 func TestNetworkInspectNotFoundError(t *testing.T) {
client/network_list_test.go
History View file @ de10c7d
... ... 
@@ -23,11 +23,8 @@ func TestNetworkListError(t *testing.T) {
23 23 
 	_, err := client.NetworkList(context.Background(), types.NetworkListOptions{
24 24 
 		Filters: filters.NewArgs(),
25 25 
 	})
26 
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
27 
-		t.Fatalf("expected a Server Error, got %v", err)
28 
-	}
29 26 
 	if !errdefs.IsSystem(err) {
30 
-		t.Fatalf("expected a Server Error, got %T", err)
27 
+		t.Fatalf("expected a Server Error, got %[1]T: %[1]v", err)
31 28 
 	}
32 29 
 }
33 30
client/network_prune_test.go
History View file @ de10c7d
... ... 
@@ -26,11 +26,8 @@ func TestNetworksPruneError(t *testing.T) {
26 26 
 	filters := filters.NewArgs()
27 27
28 28 
 	_, err := client.NetworksPrune(context.Background(), filters)
29 
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
30 
-		t.Fatalf("expected a Server Error, got %v", err)
31 
-	}
32 29 
 	if !errdefs.IsSystem(err) {
33 
-		t.Fatalf("expected a Server Error, got %T", err)
30 
+		t.Fatalf("expected a Server Error, got %[1]T: %[1]v", err)
34 31 
 	}
35 32 
 }
36 33
client/network_remove_test.go
History View file @ de10c7d
... ... 
@@ -18,11 +18,8 @@ func TestNetworkRemoveError(t *testing.T) {
18 18 
 	}
19 19
20 20 
 	err := client.NetworkRemove(context.Background(), "network_id")
21 
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
22 
-		t.Fatalf("expected a Server Error, got %v", err)
23 
-	}
24 21 
 	if !errdefs.IsSystem(err) {
25 
-		t.Fatalf("expected a Server Error, got %T", err)
22 
+		t.Fatalf("expected a Server Error, got %[1]T: %[1]v", err)
26 23 
 	}
27 24 
 }
28 25
client/node_inspect_test.go
History View file @ de10c7d
... ... 
@@ -21,11 +21,8 @@ func TestNodeInspectError(t *testing.T) {
21 21 
 	}
22 22
23 23 
 	_, _, err := client.NodeInspectWithRaw(context.Background(), "nothing")
24 
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
25 
-		t.Fatalf("expected a Server Error, got %v", err)
26 
-	}
27 24 
 	if !errdefs.IsSystem(err) {
28 
-		t.Fatalf("expected a Server Error, got %T", err)
25 
+		t.Fatalf("expected a Server Error, got %[1]T: %[1]v", err)
29 26 
 	}
30 27 
 }
31 28
client/node_list_test.go
History View file @ de10c7d
... ... 
@@ -22,11 +22,8 @@ func TestNodeListError(t *testing.T) {
22 22 
 	}
23 23
24 24 
 	_, err := client.NodeList(context.Background(), types.NodeListOptions{})
25 
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
26 
-		t.Fatalf("expected a Server Error, got %v", err)
27 
-	}
28 25 
 	if !errdefs.IsSystem(err) {
29 
-		t.Fatalf("expected a Server Error, got %T", err)
26 
+		t.Fatalf("expected a Server Error, got %[1]T: %[1]v", err)
30 27 
 	}
31 28 
 }
32 29
client/node_remove_test.go
History View file @ de10c7d
... ... 
@@ -19,11 +19,8 @@ func TestNodeRemoveError(t *testing.T) {
19 19 
 	}
20 20
21 21 
 	err := client.NodeRemove(context.Background(), "node_id", types.NodeRemoveOptions{Force: false})
22 
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
23 
-		t.Fatalf("expected a Server Error, got %v", err)
24 
-	}
25 22 
 	if !errdefs.IsSystem(err) {
26 
-		t.Fatalf("expected a Server Error, got %T", err)
23 
+		t.Fatalf("expected a Server Error, got %[1]T: %[1]v", err)
27 24 
 	}
28 25 
 }
29 26
client/node_update_test.go
History View file @ de10c7d
... ... 
@@ -19,11 +19,8 @@ func TestNodeUpdateError(t *testing.T) {
19 19 
 	}
20 20
21 21 
 	err := client.NodeUpdate(context.Background(), "node_id", swarm.Version{}, swarm.NodeSpec{})
22 
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
23 
-		t.Fatalf("expected a Server Error, got %v", err)
24 
-	}
25 22 
 	if !errdefs.IsSystem(err) {
26 
-		t.Fatalf("expected a Server Error, got %T", err)
23 
+		t.Fatalf("expected a Server Error, got %[1]T: %[1]v", err)
27 24 
 	}
28 25 
 }
29 26
client/plugin_disable_test.go
History View file @ de10c7d
... ... 
@@ -19,11 +19,8 @@ func TestPluginDisableError(t *testing.T) {
19 19 
 	}
20 20
21 21 
 	err := client.PluginDisable(context.Background(), "plugin_name", types.PluginDisableOptions{})
22 
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
23 
-		t.Fatalf("expected a Server Error, got %v", err)
24 
-	}
25 22 
 	if !errdefs.IsSystem(err) {
26 
-		t.Fatalf("expected a Server Error, got %T", err)
23 
+		t.Fatalf("expected a Server Error, got %[1]T: %[1]v", err)
27 24 
 	}
28 25 
 }
29 26
client/plugin_enable_test.go
History View file @ de10c7d
... ... 
@@ -19,11 +19,8 @@ func TestPluginEnableError(t *testing.T) {
19 19 
 	}
20 20
21 21 
 	err := client.PluginEnable(context.Background(), "plugin_name", types.PluginEnableOptions{})
22 
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
23 
-		t.Fatalf("expected a Server Error, got %v", err)
24 
-	}
25 22 
 	if !errdefs.IsSystem(err) {
26 
-		t.Fatalf("expected a Server Error, got %T", err)
23 
+		t.Fatalf("expected a Server Error, got %[1]T: %[1]v", err)
27 24 
 	}
28 25 
 }
29 26
client/plugin_inspect_test.go
History View file @ de10c7d
... ... 
@@ -21,11 +21,8 @@ func TestPluginInspectError(t *testing.T) {
21 21 
 	}
22 22
23 23 
 	_, _, err := client.PluginInspectWithRaw(context.Background(), "nothing")
24 
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
25 
-		t.Fatalf("expected a Server Error, got %v", err)
26 
-	}
27 24 
 	if !errdefs.IsSystem(err) {
28 
-		t.Fatalf("expected a Server Error, got %T", err)
25 
+		t.Fatalf("expected a Server Error, got %[1]T: %[1]v", err)
29 26 
 	}
30 27 
 }
31 28
client/plugin_list_test.go
History View file @ de10c7d
... ... 
@@ -21,11 +21,8 @@ func TestPluginListError(t *testing.T) {
21 21 
 	}
22 22
23 23 
 	_, err := client.PluginList(context.Background(), filters.NewArgs())
24 
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
25 
-		t.Fatalf("expected a Server Error, got %v", err)
26 
-	}
27 24 
 	if !errdefs.IsSystem(err) {
28 
-		t.Fatalf("expected a Server Error, got %T", err)
25 
+		t.Fatalf("expected a Server Error, got %[1]T: %[1]v", err)
29 26 
 	}
30 27 
 }
31 28
client/plugin_push_test.go
History View file @ de10c7d
... ... 
@@ -18,11 +18,8 @@ func TestPluginPushError(t *testing.T) {
18 18 
 	}
19 19
20 20 
 	_, err := client.PluginPush(context.Background(), "plugin_name", "")
21 
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
22 
-		t.Fatalf("expected a Server Error, got %v", err)
23 
-	}
24 21 
 	if !errdefs.IsSystem(err) {
25 
-		t.Fatalf("expected a Server Error, got %T", err)
22 
+		t.Fatalf("expected a Server Error, got %[1]T: %[1]v", err)
26 23 
 	}
27 24 
 }
28 25
client/plugin_remove_test.go
History View file @ de10c7d
... ... 
@@ -19,11 +19,8 @@ func TestPluginRemoveError(t *testing.T) {
19 19 
 	}
20 20
21 21 
 	err := client.PluginRemove(context.Background(), "plugin_name", types.PluginRemoveOptions{})
22 
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
23 
-		t.Fatalf("expected a Server Error, got %v", err)
24 
-	}
25 22 
 	if !errdefs.IsSystem(err) {
26 
-		t.Fatalf("expected a Server Error, got %T", err)
23 
+		t.Fatalf("expected a Server Error, got %[1]T: %[1]v", err)
27 24 
 	}
28 25 
 }
29 26
client/plugin_set_test.go
History View file @ de10c7d
... ... 
@@ -18,11 +18,8 @@ func TestPluginSetError(t *testing.T) {
18 18 
 	}
19 19
20 20 
 	err := client.PluginSet(context.Background(), "plugin_name", []string{})
21 
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
22 
-		t.Fatalf("expected a Server Error, got %v", err)
23 
-	}
24 21 
 	if !errdefs.IsSystem(err) {
25 
-		t.Fatalf("expected a Server Error, got %T", err)
22 
+		t.Fatalf("expected a Server Error, got %[1]T: %[1]v", err)
26 23 
 	}
27 24 
 }
28 25
client/request_test.go
History View file @ de10c7d
... ... 
@@ -86,11 +86,8 @@ func TestPlainTextError(t *testing.T) {
86 86 
 		client: newMockClient(plainTextErrorMock(http.StatusInternalServerError, "Server error")),
87 87 
 	}
88 88 
 	_, err := client.ContainerList(context.Background(), types.ContainerListOptions{})
89 
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
90 
-		t.Fatalf("expected a Server Error, got %v", err)
91 
-	}
92 89 
 	if !errdefs.IsSystem(err) {
93 
-		t.Fatalf("expected a Server Error, got %T", err)
90 
+		t.Fatalf("expected a Server Error, got %[1]T: %[1]v", err)
94 91 
 	}
95 92 
 }
96 93
client/secret_create_test.go
History View file @ de10c7d
... ... 
@@ -32,11 +32,8 @@ func TestSecretCreateError(t *testing.T) {
32 32 
 		client:  newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
33 33 
 	}
34 34 
 	_, err := client.SecretCreate(context.Background(), swarm.SecretSpec{})
35 
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
36 
-		t.Fatalf("expected a Server Error, got %v", err)
37 
-	}
38 35 
 	if !errdefs.IsSystem(err) {
39 
-		t.Fatalf("expected a Server Error, got %T", err)
36 
+		t.Fatalf("expected a Server Error, got %[1]T: %[1]v", err)
40 37 
 	}
41 38 
 }
42 39
client/secret_inspect_test.go
History View file @ de10c7d
... ... 
@@ -33,11 +33,8 @@ func TestSecretInspectError(t *testing.T) {
33 33 
 	}
34 34
35 35 
 	_, _, err := client.SecretInspectWithRaw(context.Background(), "nothing")
36 
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
37 
-		t.Fatalf("expected a Server Error, got %v", err)
38 
-	}
39 36 
 	if !errdefs.IsSystem(err) {
40 
-		t.Fatalf("expected a Server Error, got %T", err)
37 
+		t.Fatalf("expected a Server Error, got %[1]T: %[1]v", err)
41 38 
 	}
42 39 
 }
43 40
client/secret_list_test.go
History View file @ de10c7d
... ... 
@@ -34,11 +34,8 @@ func TestSecretListError(t *testing.T) {
34 34 
 	}
35 35
36 36 
 	_, err := client.SecretList(context.Background(), types.SecretListOptions{})
37 
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
38 
-		t.Fatalf("expected a Server Error, got %v", err)
39 
-	}
40 37 
 	if !errdefs.IsSystem(err) {
41 
-		t.Fatalf("expected a Server Error, got %T", err)
38 
+		t.Fatalf("expected a Server Error, got %[1]T: %[1]v", err)
42 39 
 	}
43 40 
 }
44 41
client/secret_remove_test.go
History View file @ de10c7d
... ... 
@@ -30,11 +30,8 @@ func TestSecretRemoveError(t *testing.T) {
30 30 
 	}
31 31
32 32 
 	err := client.SecretRemove(context.Background(), "secret_id")
33 
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
34 
-		t.Fatalf("expected a Server Error, got %v", err)
35 
-	}
36 33 
 	if !errdefs.IsSystem(err) {
37 
-		t.Fatalf("expected a Server Error, got %T", err)
34 
+		t.Fatalf("expected a Server Error, got %[1]T: %[1]v", err)
38 35 
 	}
39 36 
 }
40 37
client/secret_update_test.go
History View file @ de10c7d
... ... 
@@ -31,11 +31,8 @@ func TestSecretUpdateError(t *testing.T) {
31 31 
 	}
32 32
33 33 
 	err := client.SecretUpdate(context.Background(), "secret_id", swarm.Version{}, swarm.SecretSpec{})
34 
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
35 
-		t.Fatalf("expected a Server Error, got %v", err)
36 
-	}
37 34 
 	if !errdefs.IsSystem(err) {
38 
-		t.Fatalf("expected a Server Error, got %T", err)
35 
+		t.Fatalf("expected a Server Error, got %[1]T: %[1]v", err)
39 36 
 	}
40 37 
 }
41 38
client/service_create_test.go
History View file @ de10c7d
... ... 
@@ -25,11 +25,8 @@ func TestServiceCreateError(t *testing.T) {
25 25 
 		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
26 26 
 	}
27 27 
 	_, err := client.ServiceCreate(context.Background(), swarm.ServiceSpec{}, types.ServiceCreateOptions{})
28 
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
29 
-		t.Fatalf("expected a Server Error, got %v", err)
30 
-	}
31 28 
 	if !errdefs.IsSystem(err) {
32 
-		t.Fatalf("expected a Server Error, got %T", err)
29 
+		t.Fatalf("expected a Server Error, got %[1]T: %[1]v", err)
33 30 
 	}
34 31 
 }
35 32
client/service_inspect_test.go
History View file @ de10c7d
... ... 
@@ -22,11 +22,8 @@ func TestServiceInspectError(t *testing.T) {
22 22 
 	}
23 23
24 24 
 	_, _, err := client.ServiceInspectWithRaw(context.Background(), "nothing", types.ServiceInspectOptions{})
25 
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
26 
-		t.Fatalf("expected a Server Error, got %v", err)
27 
-	}
28 25 
 	if !errdefs.IsSystem(err) {
29 
-		t.Fatalf("expected a Server Error, got %T", err)
26 
+		t.Fatalf("expected a Server Error, got %[1]T: %[1]v", err)
30 27 
 	}
31 28 
 }
32 29
client/service_list_test.go
History View file @ de10c7d
... ... 
@@ -22,11 +22,8 @@ func TestServiceListError(t *testing.T) {
22 22 
 	}
23 23
24 24 
 	_, err := client.ServiceList(context.Background(), types.ServiceListOptions{})
25 
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
26 
-		t.Fatalf("expected a Server Error, got %v", err)
27 
-	}
28 25 
 	if !errdefs.IsSystem(err) {
29 
-		t.Fatalf("expected a Server Error, got %T", err)
26 
+		t.Fatalf("expected a Server Error, got %[1]T: %[1]v", err)
30 27 
 	}
31 28 
 }
32 29
client/service_logs_test.go
History View file @ de10c7d
... ... 
@@ -14,6 +14,7 @@ import (
14 14 
 	"time"
15 15
16 16 
 	"github.com/docker/docker/api/types"
17 
+	"github.com/docker/docker/errdefs"
17 18 
 	"gotest.tools/assert"
18 19 
 	is "gotest.tools/assert/cmp"
19 20 
 )
... ... 
@@ -23,7 +24,9 @@ func TestServiceLogsError(t *testing.T) {
23 23 
 		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
24 24 
 	}
25 25 
 	_, err := client.ServiceLogs(context.Background(), "service_id", types.ContainerLogsOptions{})
26 
-	assert.Check(t, is.Error(err, "Error response from daemon: Server error"))
26 
+	if !errdefs.IsSystem(err) {
27 
+		t.Fatalf("expected a Server Error, got %[1]T: %[1]v", err)
28 
+	}
27 29 
 	_, err = client.ServiceLogs(context.Background(), "service_id", types.ContainerLogsOptions{
28 30 
 		Since: "2006-01-02TZ",
29 31 
 	})
client/service_remove_test.go
History View file @ de10c7d
... ... 
@@ -9,6 +9,7 @@ import (
9 9 
 	"strings"
10 10 
 	"testing"
11 11
12 
+	"github.com/docker/docker/errdefs"
12 13 
 	"gotest.tools/assert"
13 14 
 	is "gotest.tools/assert/cmp"
14 15 
 )
... ... 
@@ -19,7 +20,9 @@ func TestServiceRemoveError(t *testing.T) {
19 19 
 	}
20 20
21 21 
 	err := client.ServiceRemove(context.Background(), "service_id")
22 
-	assert.Check(t, is.Error(err, "Error response from daemon: Server error"))
22 
+	if !errdefs.IsSystem(err) {
23 
+		t.Fatalf("expected a Server Error, got %[1]T: %[1]v", err)
24 
+	}
23 25 
 }
24 26
25 27 
 func TestServiceRemoveNotFoundError(t *testing.T) {
client/service_update_test.go
History View file @ de10c7d
... ... 
@@ -20,11 +20,8 @@ func TestServiceUpdateError(t *testing.T) {
20 20 
 	}
21 21
22 22 
 	_, err := client.ServiceUpdate(context.Background(), "service_id", swarm.Version{}, swarm.ServiceSpec{}, types.ServiceUpdateOptions{})
23 
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
24 
-		t.Fatalf("expected a Server Error, got %v", err)
25 
-	}
26 23 
 	if !errdefs.IsSystem(err) {
27 
-		t.Fatalf("expected a Server Error, got %T", err)
24 
+		t.Fatalf("expected a Server Error, got %[1]T: %[1]v", err)
28 25 
 	}
29 26 
 }
30 27
client/swarm_get_unlock_key_test.go
History View file @ de10c7d
... ... 
@@ -11,6 +11,7 @@ import (
11 11 
 	"testing"
12 12
13 13 
 	"github.com/docker/docker/api/types"
14 
+	"github.com/docker/docker/errdefs"
14 15 
 	"gotest.tools/assert"
15 16 
 	is "gotest.tools/assert/cmp"
16 17 
 )
... ... 
@@ -21,7 +22,9 @@ func TestSwarmGetUnlockKeyError(t *testing.T) {
21 21 
 	}
22 22
23 23 
 	_, err := client.SwarmGetUnlockKey(context.Background())
24 
-	assert.Check(t, is.ErrorContains(err, "Error response from daemon: Server error"))
24 
+	if !errdefs.IsSystem(err) {
25 
+		t.Fatalf("expected a Server Error, got %[1]T: %[1]v", err)
26 
+	}
25 27 
 }
26 28
27 29 
 func TestSwarmGetUnlockKey(t *testing.T) {
client/swarm_init_test.go
History View file @ de10c7d
... ... 
@@ -19,11 +19,8 @@ func TestSwarmInitError(t *testing.T) {
19 19 
 	}
20 20
21 21 
 	_, err := client.SwarmInit(context.Background(), swarm.InitRequest{})
22 
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
23 
-		t.Fatalf("expected a Server Error, got %v", err)
24 
-	}
25 22 
 	if !errdefs.IsSystem(err) {
26 
-		t.Fatalf("expected a Server Error, got %T", err)
23 
+		t.Fatalf("expected a Server Error, got %[1]T: %[1]v", err)
27 24 
 	}
28 25 
 }
29 26
client/swarm_inspect_test.go
History View file @ de10c7d
... ... 
@@ -20,11 +20,8 @@ func TestSwarmInspectError(t *testing.T) {
20 20 
 	}
21 21
22 22 
 	_, err := client.SwarmInspect(context.Background())
23 
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
24 
-		t.Fatalf("expected a Server Error, got %v", err)
25 
-	}
26 23 
 	if !errdefs.IsSystem(err) {
27 
-		t.Fatalf("expected a Server Error, got %T", err)
24 
+		t.Fatalf("expected a Server Error, got %[1]T: %[1]v", err)
28 25 
 	}
29 26 
 }
30 27
client/swarm_join_test.go
History View file @ de10c7d
... ... 
@@ -19,11 +19,8 @@ func TestSwarmJoinError(t *testing.T) {
19 19 
 	}
20 20
21 21 
 	err := client.SwarmJoin(context.Background(), swarm.JoinRequest{})
22 
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
23 
-		t.Fatalf("expected a Server Error, got %v", err)
24 
-	}
25 22 
 	if !errdefs.IsSystem(err) {
26 
-		t.Fatalf("expected a Server Error, got %T", err)
23 
+		t.Fatalf("expected a Server Error, got %[1]T: %[1]v", err)
27 24 
 	}
28 25 
 }
29 26
client/swarm_leave_test.go
History View file @ de10c7d
... ... 
@@ -18,11 +18,8 @@ func TestSwarmLeaveError(t *testing.T) {
18 18 
 	}
19 19
20 20 
 	err := client.SwarmLeave(context.Background(), false)
21 
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
22 
-		t.Fatalf("expected a Server Error, got %v", err)
23 
-	}
24 21 
 	if !errdefs.IsSystem(err) {
25 
-		t.Fatalf("expected a Server Error, got %T", err)
22 
+		t.Fatalf("expected a Server Error, got %[1]T: %[1]v", err)
26 23 
 	}
27 24 
 }
28 25
client/swarm_unlock_test.go
History View file @ de10c7d
... ... 
@@ -19,11 +19,8 @@ func TestSwarmUnlockError(t *testing.T) {
19 19 
 	}
20 20
21 21 
 	err := client.SwarmUnlock(context.Background(), swarm.UnlockRequest{UnlockKey: "SWMKEY-1-y6guTZNTwpQeTL5RhUfOsdBdXoQjiB2GADHSRJvbXeU"})
22 
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
23 
-		t.Fatalf("expected a Server Error, got %v", err)
24 
-	}
25 22 
 	if !errdefs.IsSystem(err) {
26 
-		t.Fatalf("expected a Server Error, got %T", err)
23 
+		t.Fatalf("expected a Server Error, got %[1]T: %[1]v", err)
27 24 
 	}
28 25 
 }
29 26
client/swarm_update_test.go
History View file @ de10c7d
... ... 
@@ -19,11 +19,8 @@ func TestSwarmUpdateError(t *testing.T) {
19 19 
 	}
20 20
21 21 
 	err := client.SwarmUpdate(context.Background(), swarm.Version{}, swarm.Spec{}, swarm.UpdateFlags{})
22 
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
23 
-		t.Fatalf("expected a Server Error, got %v", err)
24 
-	}
25 22 
 	if !errdefs.IsSystem(err) {
26 
-		t.Fatalf("expected a Server Error, got %T", err)
23 
+		t.Fatalf("expected a Server Error, got %[1]T: %[1]v", err)
27 24 
 	}
28 25 
 }
29 26
client/task_inspect_test.go
History View file @ de10c7d
... ... 
@@ -21,11 +21,8 @@ func TestTaskInspectError(t *testing.T) {
21 21 
 	}
22 22
23 23 
 	_, _, err := client.TaskInspectWithRaw(context.Background(), "nothing")
24 
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
25 
-		t.Fatalf("expected a Server Error, got %v", err)
26 
-	}
27 24 
 	if !errdefs.IsSystem(err) {
28 
-		t.Fatalf("expected a Server Error, got %T", err)
25 
+		t.Fatalf("expected a Server Error, got %[1]T: %[1]v", err)
29 26 
 	}
30 27 
 }
31 28
client/task_list_test.go
History View file @ de10c7d
... ... 
@@ -22,11 +22,8 @@ func TestTaskListError(t *testing.T) {
22 22 
 	}
23 23
24 24 
 	_, err := client.TaskList(context.Background(), types.TaskListOptions{})
25 
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
26 
-		t.Fatalf("expected a Server Error, got %v", err)
27 
-	}
28 25 
 	if !errdefs.IsSystem(err) {
29 
-		t.Fatalf("expected a Server Error, got %T", err)
26 
+		t.Fatalf("expected a Server Error, got %[1]T: %[1]v", err)
30 27 
 	}
31 28 
 }
32 29
client/volume_create_test.go
History View file @ de10c7d
... ... 
@@ -21,11 +21,8 @@ func TestVolumeCreateError(t *testing.T) {
21 21 
 	}
22 22
23 23 
 	_, err := client.VolumeCreate(context.Background(), volumetypes.VolumeCreateBody{})
24 
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
25 
-		t.Fatalf("expected a Server Error, got %v", err)
26 
-	}
27 24 
 	if !errdefs.IsSystem(err) {
28 
-		t.Fatalf("expected a Server Error, got %T", err)
25 
+		t.Fatalf("expected a Server Error, got %[1]T: %[1]v", err)
29 26 
 	}
30 27 
 }
31 28
client/volume_inspect_test.go
History View file @ de10c7d
... ... 
@@ -11,6 +11,7 @@ import (
11 11 
 	"testing"
12 12
13 13 
 	"github.com/docker/docker/api/types"
14 
+	"github.com/docker/docker/errdefs"
14 15 
 	"github.com/pkg/errors"
15 16 
 	"gotest.tools/assert"
16 17 
 	is "gotest.tools/assert/cmp"
... ... 
@@ -22,7 +23,9 @@ func TestVolumeInspectError(t *testing.T) {
22 22 
 	}
23 23
24 24 
 	_, err := client.VolumeInspect(context.Background(), "nothing")
25 
-	assert.Check(t, is.ErrorContains(err, "Error response from daemon: Server error"))
25 
+	if !errdefs.IsSystem(err) {
26 
+		t.Fatalf("expected a Server Error, got %[1]T: %[1]v", err)
27 
+	}
26 28 
 }
27 29
28 30 
 func TestVolumeInspectNotFound(t *testing.T) {
client/volume_list_test.go
History View file @ de10c7d
... ... 
@@ -22,11 +22,8 @@ func TestVolumeListError(t *testing.T) {
22 22 
 	}
23 23
24 24 
 	_, err := client.VolumeList(context.Background(), filters.NewArgs())
25 
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
26 
-		t.Fatalf("expected a Server Error, got %v", err)
27 
-	}
28 25 
 	if !errdefs.IsSystem(err) {
29 
-		t.Fatalf("expected a Server Error, got %T", err)
26 
+		t.Fatalf("expected a Server Error, got %[1]T: %[1]v", err)
30 27 
 	}
31 28 
 }
32 29
client/volume_remove_test.go
History View file @ de10c7d
... ... 
@@ -18,11 +18,8 @@ func TestVolumeRemoveError(t *testing.T) {
18 18 
 	}
19 19
20 20 
 	err := client.VolumeRemove(context.Background(), "volume_id", false)
21 
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
22 
-		t.Fatalf("expected a Server Error, got %v", err)
23 
-	}
24 21 
 	if !errdefs.IsSystem(err) {
25 
-		t.Fatalf("expected a Server Error, got %T", err)
22 
+		t.Fatalf("expected a Server Error, got %[1]T: %[1]v", err)
26 23 
 	}
27 24 
 }
28 25