Merge pull request #1709 from erictune/move_line

Fix format specifiers in Printf-type functions.
This commit is contained in:
Tim Hockin
2014-10-09 20:40:35 -07:00
15 changed files with 24 additions and 24 deletions

View File

@@ -85,7 +85,7 @@ func TestOVirtCloudXmlParsing(t *testing.T) {
t.Fatalf("Unexpected error listing instances: %s", err3)
}
if len(instances3) > 0 {
t.Fatalf("Unexpected number of instance(s): %i", len(instances3))
t.Fatalf("Unexpected number of instance(s): %d", len(instances3))
}
body4 := strings.NewReader(`
@@ -116,7 +116,7 @@ func TestOVirtCloudXmlParsing(t *testing.T) {
t.Fatalf("Unexpected error listing instances: %s", err4)
}
if len(instances4) != 2 {
t.Fatalf("Unexpected number of instance(s): %i", len(instances4))
t.Fatalf("Unexpected number of instance(s): %d", len(instances4))
}
if instances4[0] != "host1" || instances4[1] != "host3" {
t.Fatalf("Unexpected instance(s): %s", instances4)

View File

@@ -112,7 +112,7 @@ func (v *VagrantCloud) IPAddress(instance string) (net.IP, error) {
return net.ParseIP(minion.IP), nil
}
}
return nil, fmt.Errorf("Unable to find IP address for instance:", instance)
return nil, fmt.Errorf("Unable to find IP address for instance: %s", instance)
}
// saltMinionsByRole filters a list of minions that have a matching role.