GitList

Browse code

Replace uses of deprecated IsErr...Notfound()

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

Sebastiaan van Stijn authored on 2017/10/03 19:05:03
Showing 8 changed files

client/checkpoint_list_test.go index 3884657..11426ed 100644
client/config_inspect_test.go index 010b188..fab0c28 100644
client/container_create_test.go index 3ab608c..9464dc6 100644
client/container_inspect_test.go index 98f83bd..37259e4 100644
client/image_inspect_test.go index 74a4e49..b5721f3 100644
client/node_inspect_test.go index dca16a8..6260da5 100644
client/secret_inspect_test.go index 1581da1..66dbb48 100644
client/service_inspect_test.go index d53f583..ade6253 100644

History View file @ 919726b

@@ -62,7 +62,7 @@ func TestCheckpointListContainerNotFound(t *testing.T) {
 	}
 
 	_, err := client.CheckpointList(context.Background(), "unknown", types.CheckpointListOptions{})
-	if err == nil || !IsErrContainerNotFound(err) {
+	if err == nil || !IsErrNotFound(err) {
 		t.Fatalf("expected a containerNotFound error, got %v", err)
 	}
 }

client/config_inspect_test.go

History View file @ 919726b

@@ -42,7 +42,7 @@ func TestConfigInspectConfigNotFound(t *testing.T) {
 	}
 
 	_, _, err := client.ConfigInspectWithRaw(context.Background(), "unknown")
-	if err == nil || !IsErrConfigNotFound(err) {
+	if err == nil || !IsErrNotFound(err) {
 		t.Fatalf("expected a configNotFoundError error, got %v", err)
 	}
 }
@@ -53,7 +53,7 @@ func TestConfigInspect(t *testing.T) {
 		version: "1.30",
 		client: newMockClient(func(req *http.Request) (*http.Response, error) {
 			if !strings.HasPrefix(req.URL.Path, expectedURL) {
-				return nil, fmt.Errorf("Expected URL '%s', got '%s'", expectedURL, req.URL)
+				return nil, fmt.Errorf("expected URL '%s', got '%s'", expectedURL, req.URL)
 			}
 			content, err := json.Marshal(swarm.Config{
 				ID: "config_id",

client/container_create_test.go

History View file @ 919726b

@@ -37,7 +37,7 @@ func TestContainerCreateImageNotFound(t *testing.T) {
 		client: newMockClient(errorMock(http.StatusNotFound, "No such image")),
 	}
 	_, err := client.ContainerCreate(context.Background(), &container.Config{Image: "unknown_image"}, nil, nil, "unknown")
-	if err == nil || !IsErrImageNotFound(err) {
+	if err == nil || !IsErrNotFound(err) {
 		t.Fatalf("expected an imageNotFound error, got %v", err)
 	}
 }

client/container_inspect_test.go

History View file @ 919726b

@@ -30,7 +30,7 @@ func TestContainerInspectContainerNotFound(t *testing.T) {
 	}
 
 	_, err := client.ContainerInspect(context.Background(), "unknown")
-	if err == nil || !IsErrContainerNotFound(err) {
+	if err == nil || !IsErrNotFound(err) {
 		t.Fatalf("expected a containerNotFound error, got %v", err)
 	}
 }

client/image_inspect_test.go

History View file @ 919726b

@@ -31,7 +31,7 @@ func TestImageInspectImageNotFound(t *testing.T) {
 	}
 
 	_, _, err := client.ImageInspectWithRaw(context.Background(), "unknown")
-	if err == nil || !IsErrImageNotFound(err) {
+	if err == nil || !IsErrNotFound(err) {
 		t.Fatalf("expected an imageNotFound error, got %v", err)
 	}
 }

client/node_inspect_test.go

History View file @ 919726b

@@ -30,7 +30,7 @@ func TestNodeInspectNodeNotFound(t *testing.T) {
 	}
 
 	_, _, err := client.NodeInspectWithRaw(context.Background(), "unknown")
-	if err == nil || !IsErrNodeNotFound(err) {
+	if err == nil || !IsErrNotFound(err) {
 		t.Fatalf("expected a nodeNotFoundError error, got %v", err)
 	}
 }

client/secret_inspect_test.go

History View file @ 919726b

@@ -42,7 +42,7 @@ func TestSecretInspectSecretNotFound(t *testing.T) {
 	}
 
 	_, _, err := client.SecretInspectWithRaw(context.Background(), "unknown")
-	if err == nil || !IsErrSecretNotFound(err) {
+	if err == nil || !IsErrNotFound(err) {
 		t.Fatalf("expected a secretNotFoundError error, got %v", err)
 	}
 }

client/service_inspect_test.go

History View file @ 919726b

@@ -31,7 +31,7 @@ func TestServiceInspectServiceNotFound(t *testing.T) {
 	}
 
 	_, _, err := client.ServiceInspectWithRaw(context.Background(), "unknown", types.ServiceInspectOptions{})
-	if err == nil || !IsErrServiceNotFound(err) {
+	if err == nil || !IsErrNotFound(err) {
 		t.Fatalf("expected a serviceNotFoundError error, got %v", err)
 	}
 }

...	...	@@ -62,7 +62,7 @@ func TestCheckpointListContainerNotFound(t *testing.T) {
62	62	}
63	63
64	64	_, err := client.CheckpointList(context.Background(), "unknown", types.CheckpointListOptions{})
65		- if err == nil \|\| !IsErrContainerNotFound(err) {
	65	+ if err == nil \|\| !IsErrNotFound(err) {
66	66	t.Fatalf("expected a containerNotFound error, got %v", err)
67	67	}
68	68	}

...	...	@@ -42,7 +42,7 @@ func TestConfigInspectConfigNotFound(t *testing.T) {
42	42	}
43	43
44	44	_, _, err := client.ConfigInspectWithRaw(context.Background(), "unknown")
45		- if err == nil \|\| !IsErrConfigNotFound(err) {
	45	+ if err == nil \|\| !IsErrNotFound(err) {
46	46	t.Fatalf("expected a configNotFoundError error, got %v", err)
47	47	}
48	48	}
...	...	@@ -53,7 +53,7 @@ func TestConfigInspect(t *testing.T) {
53	53	version: "1.30",
54	54	client: newMockClient(func(req http.Request) (http.Response, error) {
55	55	if !strings.HasPrefix(req.URL.Path, expectedURL) {
56		- return nil, fmt.Errorf("Expected URL '%s', got '%s'", expectedURL, req.URL)
	56	+ return nil, fmt.Errorf("expected URL '%s', got '%s'", expectedURL, req.URL)
57	57	}
58	58	content, err := json.Marshal(swarm.Config{
59	59	ID: "config_id",

...	...	@@ -37,7 +37,7 @@ func TestContainerCreateImageNotFound(t *testing.T) {
37	37	client: newMockClient(errorMock(http.StatusNotFound, "No such image")),
38	38	}
39	39	_, err := client.ContainerCreate(context.Background(), &container.Config{Image: "unknown_image"}, nil, nil, "unknown")
40		- if err == nil \|\| !IsErrImageNotFound(err) {
	40	+ if err == nil \|\| !IsErrNotFound(err) {
41	41	t.Fatalf("expected an imageNotFound error, got %v", err)
42	42	}
43	43	}

...	...	@@ -30,7 +30,7 @@ func TestContainerInspectContainerNotFound(t *testing.T) {
30	30	}
31	31
32	32	_, err := client.ContainerInspect(context.Background(), "unknown")
33		- if err == nil \|\| !IsErrContainerNotFound(err) {
	33	+ if err == nil \|\| !IsErrNotFound(err) {
34	34	t.Fatalf("expected a containerNotFound error, got %v", err)
35	35	}
36	36	}

...	...	@@ -31,7 +31,7 @@ func TestImageInspectImageNotFound(t *testing.T) {
31	31	}
32	32
33	33	_, _, err := client.ImageInspectWithRaw(context.Background(), "unknown")
34		- if err == nil \|\| !IsErrImageNotFound(err) {
	34	+ if err == nil \|\| !IsErrNotFound(err) {
35	35	t.Fatalf("expected an imageNotFound error, got %v", err)
36	36	}
37	37	}

...	...	@@ -30,7 +30,7 @@ func TestNodeInspectNodeNotFound(t *testing.T) {
30	30	}
31	31
32	32	_, _, err := client.NodeInspectWithRaw(context.Background(), "unknown")
33		- if err == nil \|\| !IsErrNodeNotFound(err) {
	33	+ if err == nil \|\| !IsErrNotFound(err) {
34	34	t.Fatalf("expected a nodeNotFoundError error, got %v", err)
35	35	}
36	36	}

...	...	@@ -42,7 +42,7 @@ func TestSecretInspectSecretNotFound(t *testing.T) {
42	42	}
43	43
44	44	_, _, err := client.SecretInspectWithRaw(context.Background(), "unknown")
45		- if err == nil \|\| !IsErrSecretNotFound(err) {
	45	+ if err == nil \|\| !IsErrNotFound(err) {
46	46	t.Fatalf("expected a secretNotFoundError error, got %v", err)
47	47	}
48	48	}

...	...	@@ -31,7 +31,7 @@ func TestServiceInspectServiceNotFound(t *testing.T) {
31	31	}
32	32
33	33	_, _, err := client.ServiceInspectWithRaw(context.Background(), "unknown", types.ServiceInspectOptions{})
34		- if err == nil \|\| !IsErrServiceNotFound(err) {
	34	+ if err == nil \|\| !IsErrNotFound(err) {
35	35	t.Fatalf("expected a serviceNotFoundError error, got %v", err)
36	36	}
37	37	}