1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00

Merge pull request #10518 from LK4D4/fix_vet_errors

Fix some go vet errors
This commit is contained in:
Tibor Vass 2015-02-02 20:49:19 -05:00
commit 662dffee4f
3 changed files with 5 additions and 5 deletions

View file

@ -26,7 +26,7 @@ func TestPullImageWithAliases(t *testing.T) {
}
defer deleteImages(repo)
if out, err := exec.Command(dockerBinary, "push", repo).CombinedOutput(); err != nil {
t.Fatalf("Failed to push image %v: error %v, output %q", err, string(out))
t.Fatalf("Failed to push image %v: error %v, output %q", repo, err, string(out))
}
}
@ -67,7 +67,7 @@ func TestPullVerified(t *testing.T) {
// push it
if out, err := exec.Command(dockerBinary, "push", repo).CombinedOutput(); err != nil {
t.Fatalf("Failed to push image %v: error %v, output %q", err, string(out))
t.Fatalf("Failed to push image %v: error %v, output %q", repo, err, string(out))
}
// remove it locally

View file

@ -60,7 +60,7 @@ func (t *testRegistryV2) Ping() error {
return err
}
if resp.StatusCode != 200 {
return fmt.Errorf("registry ping replied with an unexpected status code %s", resp.StatusCode)
return fmt.Errorf("registry ping replied with an unexpected status code %d", resp.StatusCode)
}
return nil
}

View file

@ -67,7 +67,7 @@ func TestValidateEndpointAmbiguousAPIVersion(t *testing.T) {
}
if testEndpoint.Version != APIVersion1 {
t.Fatalf("expected endpoint to validate to %s, got %s", APIVersion1, testEndpoint.Version)
t.Fatalf("expected endpoint to validate to %d, got %d", APIVersion1, testEndpoint.Version)
}
// Make a test server which should validate as a v2 server.
@ -87,6 +87,6 @@ func TestValidateEndpointAmbiguousAPIVersion(t *testing.T) {
}
if testEndpoint.Version != APIVersion2 {
t.Fatalf("expected endpoint to validate to %s, got %s", APIVersion2, testEndpoint.Version)
t.Fatalf("expected endpoint to validate to %d, got %d", APIVersion2, testEndpoint.Version)
}
}