GitList

Browse code

expected new_container_id while testing ContainerCommit Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>

lixiaobing10051267 authored on 2016/11/17 16:50:38
Showing 6 changed files

client/container_commit_test.go index a844675..6947ed3 100644
client/container_copy_test.go index 7eded61..6863cfb 100644
client/container_inspect_test.go index f1a6f4a..98f83bd 100644
client/image_import_test.go index e309be7..370ad5f 100644
client/network_inspect_test.go index 1f926d6..55f04ec 100644
client/plugin_remove_test.go index a15f166..b2d5157 100644

@@ -91,6 +91,6 @@ func TestContainerCommit(t *testing.T) {
 		t.Fatal(err)
 	}
 	if r.ID != "new_container_id" {
-		t.Fatalf("expected `container_id`, got %s", r.ID)
+		t.Fatalf("expected `new_container_id`, got %s", r.ID)
 	}
 }

client/container_copy_test.go

History View file @ 773ae28

@@ -195,7 +195,7 @@ func TestCopyFromContainer(t *testing.T) {
 				return nil, fmt.Errorf("Expected URL '%s', got '%s'", expectedURL, req.URL)
 			}
 			if req.Method != "GET" {
-				return nil, fmt.Errorf("expected PUT method, got %s", req.Method)
+				return nil, fmt.Errorf("expected GET method, got %s", req.Method)
 			}
 			query := req.URL.Query()
 			path := query.Get("path")

client/container_inspect_test.go

History View file @ 773ae28

@@ -67,10 +67,10 @@ func TestContainerInspect(t *testing.T) {
 		t.Fatalf("expected `container_id`, got %s", r.ID)
 	}
 	if r.Image != "image" {
-		t.Fatalf("expected `image`, got %s", r.ID)
+		t.Fatalf("expected `image`, got %s", r.Image)
 	}
 	if r.Name != "name" {
-		t.Fatalf("expected `name`, got %s", r.ID)
+		t.Fatalf("expected `name`, got %s", r.Name)
 	}
 }
 
@@ -107,10 +107,10 @@ func TestContainerInspectNode(t *testing.T) {
 		t.Fatalf("expected `container_id`, got %s", r.ID)
 	}
 	if r.Image != "image" {
-		t.Fatalf("expected `image`, got %s", r.ID)
+		t.Fatalf("expected `image`, got %s", r.Image)
 	}
 	if r.Name != "name" {
-		t.Fatalf("expected `name`, got %s", r.ID)
+		t.Fatalf("expected `name`, got %s", r.Name)
 	}
 	if r.Node.ID != "container_node_id" {
 		t.Fatalf("expected `container_node_id`, got %s", r.Node.ID)

client/image_import_test.go

History View file @ 773ae28

@@ -37,7 +37,7 @@ func TestImageImport(t *testing.T) {
 			}
 			repo := query.Get("repo")
 			if repo != "repository_name:imported" {
-				return nil, fmt.Errorf("repo not set in URL query properly. Expected 'repository_name', got %s", repo)
+				return nil, fmt.Errorf("repo not set in URL query properly. Expected 'repository_name:imported', got %s", repo)
 			}
 			tag := query.Get("tag")
 			if tag != "imported" {

client/network_inspect_test.go

History View file @ 773ae28

@@ -31,7 +31,7 @@ func TestNetworkInspectContainerNotFound(t *testing.T) {
 
 	_, err := client.NetworkInspect(context.Background(), "unknown")
 	if err == nil || !IsErrNetworkNotFound(err) {
-		t.Fatalf("expected a containerNotFound error, got %v", err)
+		t.Fatalf("expected a networkNotFound error, got %v", err)
 	}
 }
 

client/plugin_remove_test.go

History View file @ 773ae28

@@ -33,7 +33,7 @@ func TestPluginRemove(t *testing.T) {
 				return nil, fmt.Errorf("Expected URL '%s', got '%s'", expectedURL, req.URL)
 			}
 			if req.Method != "DELETE" {
-				return nil, fmt.Errorf("expected POST method, got %s", req.Method)
+				return nil, fmt.Errorf("expected DELETE method, got %s", req.Method)
 			}
 			return &http.Response{
 				StatusCode: http.StatusOK,

...	...	@@ -195,7 +195,7 @@ func TestCopyFromContainer(t *testing.T) {
195	195	return nil, fmt.Errorf("Expected URL '%s', got '%s'", expectedURL, req.URL)
196	196	}
197	197	if req.Method != "GET" {
198		- return nil, fmt.Errorf("expected PUT method, got %s", req.Method)
	198	+ return nil, fmt.Errorf("expected GET method, got %s", req.Method)
199	199	}
200	200	query := req.URL.Query()
201	201	path := query.Get("path")

...	...	@@ -37,7 +37,7 @@ func TestImageImport(t *testing.T) {
37	37	}
38	38	repo := query.Get("repo")
39	39	if repo != "repository_name:imported" {
40		- return nil, fmt.Errorf("repo not set in URL query properly. Expected 'repository_name', got %s", repo)
	40	+ return nil, fmt.Errorf("repo not set in URL query properly. Expected 'repository_name:imported', got %s", repo)
41	41	}
42	42	tag := query.Get("tag")
43	43	if tag != "imported" {

...	...	@@ -91,6 +91,6 @@ func TestContainerCommit(t *testing.T) {
91	91	t.Fatal(err)
92	92	}
93	93	if r.ID != "new_container_id" {
94		- t.Fatalf("expected `container_id`, got %s", r.ID)
	94	+ t.Fatalf("expected `new_container_id`, got %s", r.ID)
95	95	}
96	96	}

...	...	@@ -67,10 +67,10 @@ func TestContainerInspect(t *testing.T) {
67	67	t.Fatalf("expected `container_id`, got %s", r.ID)
68	68	}
69	69	if r.Image != "image" {
70		- t.Fatalf("expected `image`, got %s", r.ID)
	70	+ t.Fatalf("expected `image`, got %s", r.Image)
71	71	}
72	72	if r.Name != "name" {
73		- t.Fatalf("expected `name`, got %s", r.ID)
	73	+ t.Fatalf("expected `name`, got %s", r.Name)
74	74	}
75	75	}
76	76
...	...	@@ -107,10 +107,10 @@ func TestContainerInspectNode(t *testing.T) {
107	107	t.Fatalf("expected `container_id`, got %s", r.ID)
108	108	}
109	109	if r.Image != "image" {
110		- t.Fatalf("expected `image`, got %s", r.ID)
	110	+ t.Fatalf("expected `image`, got %s", r.Image)
111	111	}
112	112	if r.Name != "name" {
113		- t.Fatalf("expected `name`, got %s", r.ID)
	113	+ t.Fatalf("expected `name`, got %s", r.Name)
114	114	}
115	115	if r.Node.ID != "container_node_id" {
116	116	t.Fatalf("expected `container_node_id`, got %s", r.Node.ID)

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

...	...	@@ -33,7 +33,7 @@ func TestPluginRemove(t *testing.T) {
33	33	return nil, fmt.Errorf("Expected URL '%s', got '%s'", expectedURL, req.URL)
34	34	}
35	35	if req.Method != "DELETE" {
36		- return nil, fmt.Errorf("expected POST method, got %s", req.Method)
	36	+ return nil, fmt.Errorf("expected DELETE method, got %s", req.Method)
37	37	}
38	38	return &http.Response{
39	39	StatusCode: http.StatusOK,