Browse code

Fix some go vet errors

Signed-off-by: Alexander Morozov <lk4d4@docker.com>

Alexander Morozov authored on 2015/02/03 07:53:20
Showing 3 changed files
... ...
@@ -26,7 +26,7 @@ func TestPullImageWithAliases(t *testing.T) {
26 26
 		}
27 27
 		defer deleteImages(repo)
28 28
 		if out, err := exec.Command(dockerBinary, "push", repo).CombinedOutput(); err != nil {
29
-			t.Fatalf("Failed to push image %v: error %v, output %q", err, string(out))
29
+			t.Fatalf("Failed to push image %v: error %v, output %q", repo, err, string(out))
30 30
 		}
31 31
 	}
32 32
 
... ...
@@ -67,7 +67,7 @@ func TestPullVerified(t *testing.T) {
67 67
 
68 68
 	// push it
69 69
 	if out, err := exec.Command(dockerBinary, "push", repo).CombinedOutput(); err != nil {
70
-		t.Fatalf("Failed to push image %v: error %v, output %q", err, string(out))
70
+		t.Fatalf("Failed to push image %v: error %v, output %q", repo, err, string(out))
71 71
 	}
72 72
 
73 73
 	// remove it locally
... ...
@@ -60,7 +60,7 @@ func (t *testRegistryV2) Ping() error {
60 60
 		return err
61 61
 	}
62 62
 	if resp.StatusCode != 200 {
63
-		return fmt.Errorf("registry ping replied with an unexpected status code %s", resp.StatusCode)
63
+		return fmt.Errorf("registry ping replied with an unexpected status code %d", resp.StatusCode)
64 64
 	}
65 65
 	return nil
66 66
 }
... ...
@@ -67,7 +67,7 @@ func TestValidateEndpointAmbiguousAPIVersion(t *testing.T) {
67 67
 	}
68 68
 
69 69
 	if testEndpoint.Version != APIVersion1 {
70
-		t.Fatalf("expected endpoint to validate to %s, got %s", APIVersion1, testEndpoint.Version)
70
+		t.Fatalf("expected endpoint to validate to %d, got %d", APIVersion1, testEndpoint.Version)
71 71
 	}
72 72
 
73 73
 	// Make a test server which should validate as a v2 server.
... ...
@@ -87,6 +87,6 @@ func TestValidateEndpointAmbiguousAPIVersion(t *testing.T) {
87 87
 	}
88 88
 
89 89
 	if testEndpoint.Version != APIVersion2 {
90
-		t.Fatalf("expected endpoint to validate to %s, got %s", APIVersion2, testEndpoint.Version)
90
+		t.Fatalf("expected endpoint to validate to %d, got %d", APIVersion2, testEndpoint.Version)
91 91
 	}
92 92
 }