Merge pull request #28538 from yongtang/11162016-Log-Logf-fix

Fix several issues with `go vet` and `gofmt -s`
This commit is contained in:
Brian Goff 2016-11-17 15:21:22 -05:00 committed by GitHub
commit a7987ef105
2 changed files with 3 additions and 3 deletions

View File

@ -372,7 +372,7 @@ func TestContainerContextWriteJSONField(t *testing.T) {
}
func TestContainerBackCompat(t *testing.T) {
containers := []types.Container{types.Container{ID: "brewhaha"}}
containers := []types.Container{{ID: "brewhaha"}}
cases := []string{
"ID",
"Names",
@ -390,7 +390,7 @@ func TestContainerBackCompat(t *testing.T) {
for _, c := range cases {
ctx := Context{Format: Format(fmt.Sprintf("{{ .%s }}", c)), Output: buf}
if err := ContainerWrite(ctx, containers); err != nil {
t.Log("could not render template for field '%s': %v", c, err)
t.Logf("could not render template for field '%s': %v", c, err)
t.Fail()
}
buf.Reset()

View File

@ -72,7 +72,7 @@ func printTable(out io.Writer, stacks []*stack) {
type stack struct {
// Name is the name of the stack
Name string
Name string
// Services is the number of the services
Services int
}