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

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

Browse source 
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 22dccaf2d6
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cli/command/formatter/container_test.go
View file

@ -372,7 +372,7 @@ func TestContainerContextWriteJSONField(t *testing.T) {
} }
func TestContainerBackCompat(t *testing.T) { func TestContainerBackCompat(t *testing.T) {
containers := []types.Container{types.Container{ID: "brewhaha"}} containers := []types.Container{{ID: "brewhaha"}}
cases := []string{ cases := []string{
"ID", "ID",
"Names", "Names",
@ -390,7 +390,7 @@ func TestContainerBackCompat(t *testing.T) {
for _, c := range cases { for _, c := range cases {
ctx := Context{Format: Format(fmt.Sprintf("{{ .%s }}", c)), Output: buf} ctx := Context{Format: Format(fmt.Sprintf("{{ .%s }}", c)), Output: buf}
if err := ContainerWrite(ctx, containers); err != nil { 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() t.Fail()
} }
buf.Reset() buf.Reset()

2
cli/command/stack/list.go
View file

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

4
daemon/commit.go
View file

@ -240,8 +240,8 @@ func (daemon *Daemon) Commit(name string, c *backend.ContainerCommitConfig) (str
} }
attributes := map[string]string{ attributes := map[string]string{
"comment": c.Comment, "comment": c.Comment,
"imageID": id.String(), "imageID": id.String(),
"imageRef": imageRef, "imageRef": imageRef,
} }
daemon.LogContainerEventWithAttributes(container, "commit", attributes) daemon.LogContainerEventWithAttributes(container, "commit", attributes)

2
volume/volume_test.go
View file

@ -254,7 +254,7 @@ func TestParseMountSpec(t *testing.T) {
t.Fatalf("Expected mount source to match. Expected: '%s', Actual: '%s'", c.expected.Source, mp.Source) t.Fatalf("Expected mount source to match. Expected: '%s', Actual: '%s'", c.expected.Source, mp.Source)
} }
if c.expected.RW != mp.RW { if c.expected.RW != mp.RW {
t.Fatalf("Expected mount writable to match. Expected: '%v', Actual: '%s'", c.expected.RW, mp.RW) t.Fatalf("Expected mount writable to match. Expected: '%v', Actual: '%v'", c.expected.RW, mp.RW)
} }
if c.expected.Propagation != mp.Propagation { if c.expected.Propagation != mp.Propagation {
t.Fatalf("Expected mount propagation to match. Expected: '%v', Actual: '%s'", c.expected.Propagation, mp.Propagation) t.Fatalf("Expected mount propagation to match. Expected: '%v', Actual: '%s'", c.expected.Propagation, mp.Propagation)