GitList

Browse code

fix t.Errorf to t.Error in serveral _test.go

Signed-off-by: wefine <wang.xiaoren@zte.com.cn>

wefine authored on 2016/11/14 18:01:17
Showing 8 changed files

api/types/filters/parse_test.go index b2ed27b..fbd9e8a 100644
client/client_test.go index ee199c2..3a6575c 100644
daemon/graphdriver/btrfs/version_test.go index 15a6e75..d78d577 100644
daemon/health_test.go index d4f0348..bd221aa 100644
opts/opts_test.go index 9f41e47..46cb9e0 100644
pkg/httputils/mimetype_test.go index 9de433e..a6cc047 100644
pkg/httputils/resumablerequestreader_test.go index 5a2906d..51b7f2c 100644
pkg/tarsum/fileinfosums_test.go index bb700d8..2e243d5 100644

@@ -23,10 +23,10 @@ func TestParseArgs(t *testing.T) {
 		}
 	}
 	if len(args.Get("created")) != 1 {
-		t.Errorf("failed to set this arg")
+		t.Error("failed to set this arg")
 	}
 	if len(args.Get("image.name")) != 2 {
-		t.Errorf("the args should have collapsed")
+		t.Error("the args should have collapsed")
 	}
 }
 
@@ -147,7 +147,7 @@ func TestEmpty(t *testing.T) {
 		t.Errorf("%s", err)
 	}
 	if a.Len() != v1.Len() {
-		t.Errorf("these should both be empty sets")
+		t.Error("these should both be empty sets")
 	}
 }
 

client/client_test.go

History View file @ f78f7de

@@ -102,11 +102,11 @@ func TestNewEnvClient(t *testing.T) {
 			// pedantic checking that this is handled correctly
 			tr := apiclient.client.Transport.(*http.Transport)
 			if tr.TLSClientConfig == nil {
-				t.Errorf("no tls config found when DOCKER_TLS_VERIFY enabled")
+				t.Error("no tls config found when DOCKER_TLS_VERIFY enabled")
 			}
 
 			if tr.TLSClientConfig.InsecureSkipVerify {
-				t.Errorf("tls verification should be enabled")
+				t.Error("tls verification should be enabled")
 			}
 		}
 

daemon/graphdriver/btrfs/version_test.go

History View file @ f78f7de

@@ -8,6 +8,6 @@ import (
 
 func TestLibVersion(t *testing.T) {
 	if btrfsLibVersion() <= 0 {
-		t.Errorf("expected output from btrfs lib version > 0")
+		t.Error("expected output from btrfs lib version > 0")
 	}
 }

daemon/health_test.go

History View file @ f78f7de

@@ -35,7 +35,7 @@ func TestNoneHealthcheck(t *testing.T) {
 
 	daemon.initHealthMonitor(c)
 	if c.State.Health != nil {
-		t.Errorf("Expecting Health to be nil, but was not")
+		t.Error("Expecting Health to be nil, but was not")
 	}
 }
 

opts/opts_test.go

History View file @ f78f7de

@@ -50,7 +50,7 @@ func TestMapOpts(t *testing.T) {
 		t.Errorf("max-size = %s != 1", tmpMap["max-size"])
 	}
 	if o.Set("dummy-val=3") == nil {
-		t.Errorf("validator is not being called")
+		t.Error("validator is not being called")
 	}
 }
 

pkg/httputils/mimetype_test.go

History View file @ f78f7de

@@ -8,6 +8,6 @@ func TestDetectContentType(t *testing.T) {
 	input := []byte("That is just a plain text")
 
 	if contentType, _, err := DetectContentType(input); err != nil || contentType != "text/plain" {
-		t.Errorf("TestDetectContentType failed")
+		t.Error("TestDetectContentType failed")
 	}
 }

pkg/httputils/resumablerequestreader_test.go

History View file @ f78f7de

@@ -229,7 +229,7 @@ func TestResumableRequestReaderWithZeroTotalSize(t *testing.T) {
 	resstr := strings.TrimSuffix(string(data), "\n")
 
 	if resstr != srvtxt {
-		t.Errorf("resstr != srvtxt")
+		t.Error("resstr != srvtxt")
 	}
 }
 
@@ -263,7 +263,7 @@ func TestResumableRequestReader(t *testing.T) {
 	resstr := strings.TrimSuffix(string(data), "\n")
 
 	if resstr != srvtxt {
-		t.Errorf("resstr != srvtxt")
+		t.Error("resstr != srvtxt")
 	}
 }
 
@@ -302,6 +302,6 @@ func TestResumableRequestReaderWithInitialResponse(t *testing.T) {
 	resstr := strings.TrimSuffix(string(data), "\n")
 
 	if resstr != srvtxt {
-		t.Errorf("resstr != srvtxt")
+		t.Error("resstr != srvtxt")
 	}
 }

pkg/tarsum/fileinfosums_test.go

History View file @ f78f7de

@@ -46,7 +46,7 @@ func TestSortFileInfoSums(t *testing.T) {
 	fis = newFileInfoSums()
 	fis.SortByPos()
 	if fis[0].Pos() != 0 {
-		t.Errorf("sorted fileInfoSums by Pos should order them by position.")
+		t.Error("sorted fileInfoSums by Pos should order them by position.")
 	}
 
 	fis = newFileInfoSums()
@@ -56,7 +56,7 @@ func TestSortFileInfoSums(t *testing.T) {
 		t.Errorf("Expected %q, got %q", expected, gotFileInfoSum)
 	}
 	if fis.GetFile("noPresent") != nil {
-		t.Errorf("Should have return nil if name not found.")
+		t.Error("Should have return nil if name not found.")
 	}
 
 }

...	...	@@ -102,11 +102,11 @@ func TestNewEnvClient(t *testing.T) {
102	102	// pedantic checking that this is handled correctly
103	103	tr := apiclient.client.Transport.(*http.Transport)
104	104	if tr.TLSClientConfig == nil {
105		- t.Errorf("no tls config found when DOCKER_TLS_VERIFY enabled")
	105	+ t.Error("no tls config found when DOCKER_TLS_VERIFY enabled")
106	106	}
107	107
108	108	if tr.TLSClientConfig.InsecureSkipVerify {
109		- t.Errorf("tls verification should be enabled")
	109	+ t.Error("tls verification should be enabled")
110	110	}
111	111	}
112	112

...	...	@@ -35,7 +35,7 @@ func TestNoneHealthcheck(t *testing.T) {
35	35
36	36	daemon.initHealthMonitor(c)
37	37	if c.State.Health != nil {
38		- t.Errorf("Expecting Health to be nil, but was not")
	38	+ t.Error("Expecting Health to be nil, but was not")
39	39	}
40	40	}
41	41

...	...	@@ -229,7 +229,7 @@ func TestResumableRequestReaderWithZeroTotalSize(t *testing.T) {
229	229	resstr := strings.TrimSuffix(string(data), "\n")
230	230
231	231	if resstr != srvtxt {
232		- t.Errorf("resstr != srvtxt")
	232	+ t.Error("resstr != srvtxt")
233	233	}
234	234	}
235	235
...	...	@@ -263,7 +263,7 @@ func TestResumableRequestReader(t *testing.T) {
263	263	resstr := strings.TrimSuffix(string(data), "\n")
264	264
265	265	if resstr != srvtxt {
266		- t.Errorf("resstr != srvtxt")
	266	+ t.Error("resstr != srvtxt")
267	267	}
268	268	}
269	269
...	...	@@ -302,6 +302,6 @@ func TestResumableRequestReaderWithInitialResponse(t *testing.T) {
302	302	resstr := strings.TrimSuffix(string(data), "\n")
303	303
304	304	if resstr != srvtxt {
305		- t.Errorf("resstr != srvtxt")
	305	+ t.Error("resstr != srvtxt")
306	306	}
307	307	}

...	...	@@ -23,10 +23,10 @@ func TestParseArgs(t *testing.T) {
23	23	}
24	24	}
25	25	if len(args.Get("created")) != 1 {
26		- t.Errorf("failed to set this arg")
	26	+ t.Error("failed to set this arg")
27	27	}
28	28	if len(args.Get("image.name")) != 2 {
29		- t.Errorf("the args should have collapsed")
	29	+ t.Error("the args should have collapsed")
30	30	}
31	31	}
32	32
...	...	@@ -147,7 +147,7 @@ func TestEmpty(t *testing.T) {
147	147	t.Errorf("%s", err)
148	148	}
149	149	if a.Len() != v1.Len() {
150		- t.Errorf("these should both be empty sets")
	150	+ t.Error("these should both be empty sets")
151	151	}
152	152	}
153	153

...	...	@@ -8,6 +8,6 @@ import (
8	8
9	9	func TestLibVersion(t *testing.T) {
10	10	if btrfsLibVersion() <= 0 {
11		- t.Errorf("expected output from btrfs lib version > 0")
	11	+ t.Error("expected output from btrfs lib version > 0")
12	12	}
13	13	}

...	...	@@ -50,7 +50,7 @@ func TestMapOpts(t *testing.T) {
50	50	t.Errorf("max-size = %s != 1", tmpMap["max-size"])
51	51	}
52	52	if o.Set("dummy-val=3") == nil {
53		- t.Errorf("validator is not being called")
	53	+ t.Error("validator is not being called")
54	54	}
55	55	}
56	56

...	...	@@ -8,6 +8,6 @@ func TestDetectContentType(t *testing.T) {
8	8	input := []byte("That is just a plain text")
9	9
10	10	if contentType, _, err := DetectContentType(input); err != nil \|\| contentType != "text/plain" {
11		- t.Errorf("TestDetectContentType failed")
	11	+ t.Error("TestDetectContentType failed")
12	12	}
13	13	}

...	...	@@ -46,7 +46,7 @@ func TestSortFileInfoSums(t *testing.T) {
46	46	fis = newFileInfoSums()
47	47	fis.SortByPos()
48	48	if fis[0].Pos() != 0 {
49		- t.Errorf("sorted fileInfoSums by Pos should order them by position.")
	49	+ t.Error("sorted fileInfoSums by Pos should order them by position.")
50	50	}
51	51
52	52	fis = newFileInfoSums()
...	...	@@ -56,7 +56,7 @@ func TestSortFileInfoSums(t *testing.T) {
56	56	t.Errorf("Expected %q, got %q", expected, gotFileInfoSum)
57	57	}
58	58	if fis.GetFile("noPresent") != nil {
59		- t.Errorf("Should have return nil if name not found.")
	59	+ t.Error("Should have return nil if name not found.")
60	60	}
61	61
62	62	}