Merge pull request #2964 from andrewsmedina/gofmt2

go fmt.

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-")
+	tmp, err := ioutil.TempDir("", "docker-graph-")
-        if err != nil {
+	if err != nil {
-                t.Fatal(err)
+		t.Fatal(err)
-        }
+	}
-        driver, err := graphdriver.New(tmp)
+	driver, err := graphdriver.New(tmp)
-        if err != nil {
+	if err != nil {
-                t.Fatal(err)
+		t.Fatal(err)
-        }
+	}
-        graph, err := docker.NewGraph(tmp, driver)
+	graph, err := docker.NewGraph(tmp, driver)
-        if err != nil {
+	if err != nil {
-                t.Fatal(err)
+		t.Fatal(err)
-        }
+	}
-        return graph, driver
+	return graph, driver
 }
 
 func nukeGraph(graph *docker.Graph) {

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)")

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")
+	content := []byte("Hello world!\n")
-       buf := new(bytes.Buffer)
+	buf := new(bytes.Buffer)
-       tw := tar.NewWriter(buf)
+	tw := tar.NewWriter(buf)
-       for _, name := range []string{"/etc/postgres/postgres.conf", "/etc/passwd", "/var/log/postgres/postgres.conf"} {
+	for _, name := range []string{"/etc/postgres/postgres.conf", "/etc/passwd", "/var/log/postgres/postgres.conf"} {
-               hdr := new(tar.Header)
+		hdr := new(tar.Header)
-               hdr.Size = int64(len(content))
+		hdr.Size = int64(len(content))
-               hdr.Name = name
+		hdr.Name = name
-               if err := tw.WriteHeader(hdr); err != nil {
+		if err := tw.WriteHeader(hdr); err != nil {
-                       return nil, err
+			return nil, err
-               }
+		}
-               tw.Write([]byte(content))
+		tw.Write([]byte(content))
-       }
+	}
-       tw.Close()
+	tw.Close()
-       return buf, nil
+	return buf, nil
 }