From fe72f15e4ab25cc6e96c76d2da2c379569756843 Mon Sep 17 00:00:00 2001 From: Andrews Medina Date: Fri, 29 Nov 2013 22:20:59 -0200 Subject: [PATCH] go fmt. result of `gofmt -w -s .` without vendors. --- integration/graph_test.go | 26 +++++++++++++------------- registry/registry.go | 2 +- utils_test.go | 30 +++++++++++++++--------------- 3 files changed, 29 insertions(+), 29 deletions(-) diff --git a/integration/graph_test.go b/integration/graph_test.go index 118ec17863..eec4c5c7dc 100644 --- a/integration/graph_test.go +++ b/integration/graph_test.go @@ -287,19 +287,19 @@ func assertNImages(graph *docker.Graph, t *testing.T, n int) { } func tempGraph(t *testing.T) (*docker.Graph, graphdriver.Driver) { - tmp, err := ioutil.TempDir("", "docker-graph-") - if err != nil { - t.Fatal(err) - } - driver, err := graphdriver.New(tmp) - if err != nil { - t.Fatal(err) - } - graph, err := docker.NewGraph(tmp, driver) - if err != nil { - t.Fatal(err) - } - return graph, driver + tmp, err := ioutil.TempDir("", "docker-graph-") + if err != nil { + t.Fatal(err) + } + driver, err := graphdriver.New(tmp) + if err != nil { + t.Fatal(err) + } + graph, err := docker.NewGraph(tmp, driver) + if err != nil { + t.Fatal(err) + } + return graph, driver } func nukeGraph(graph *docker.Graph) { diff --git a/registry/registry.go b/registry/registry.go index d3d9f2be54..6aea458e99 100644 --- a/registry/registry.go +++ b/registry/registry.go @@ -47,7 +47,7 @@ func pingRegistryEndpoint(endpoint string) error { if err != nil { return err } - defer resp.Body.Close() + defer resp.Body.Close() if resp.Header.Get("X-Docker-Registry-Version") == "" { return errors.New("This does not look like a Registry server (\"X-Docker-Registry-Version\" header not found in the response)") diff --git a/utils_test.go b/utils_test.go index f4fa80a5f1..4b8cfba39f 100644 --- a/utils_test.go +++ b/utils_test.go @@ -1,24 +1,24 @@ package docker import ( - "io" "archive/tar" "bytes" + "io" ) func fakeTar() (io.Reader, error) { - content := []byte("Hello world!\n") - buf := new(bytes.Buffer) - tw := tar.NewWriter(buf) - for _, name := range []string{"/etc/postgres/postgres.conf", "/etc/passwd", "/var/log/postgres/postgres.conf"} { - hdr := new(tar.Header) - hdr.Size = int64(len(content)) - hdr.Name = name - if err := tw.WriteHeader(hdr); err != nil { - return nil, err - } - tw.Write([]byte(content)) - } - tw.Close() - return buf, nil + content := []byte("Hello world!\n") + buf := new(bytes.Buffer) + tw := tar.NewWriter(buf) + for _, name := range []string{"/etc/postgres/postgres.conf", "/etc/passwd", "/var/log/postgres/postgres.conf"} { + hdr := new(tar.Header) + hdr.Size = int64(len(content)) + hdr.Name = name + if err := tw.WriteHeader(hdr); err != nil { + return nil, err + } + tw.Write([]byte(content)) + } + tw.Close() + return buf, nil }