result of `gofmt -w -s .` without vendors.
| ... | ... |
@@ -287,19 +287,19 @@ func assertNImages(graph *docker.Graph, t *testing.T, n int) {
|
| 287 | 287 |
} |
| 288 | 288 |
|
| 289 | 289 |
func tempGraph(t *testing.T) (*docker.Graph, graphdriver.Driver) {
|
| 290 |
- tmp, err := ioutil.TempDir("", "docker-graph-")
|
|
| 291 |
- if err != nil {
|
|
| 292 |
- t.Fatal(err) |
|
| 293 |
- } |
|
| 294 |
- driver, err := graphdriver.New(tmp) |
|
| 295 |
- if err != nil {
|
|
| 296 |
- t.Fatal(err) |
|
| 297 |
- } |
|
| 298 |
- graph, err := docker.NewGraph(tmp, driver) |
|
| 299 |
- if err != nil {
|
|
| 300 |
- t.Fatal(err) |
|
| 301 |
- } |
|
| 302 |
- return graph, driver |
|
| 290 |
+ tmp, err := ioutil.TempDir("", "docker-graph-")
|
|
| 291 |
+ if err != nil {
|
|
| 292 |
+ t.Fatal(err) |
|
| 293 |
+ } |
|
| 294 |
+ driver, err := graphdriver.New(tmp) |
|
| 295 |
+ if err != nil {
|
|
| 296 |
+ t.Fatal(err) |
|
| 297 |
+ } |
|
| 298 |
+ graph, err := docker.NewGraph(tmp, driver) |
|
| 299 |
+ if err != nil {
|
|
| 300 |
+ t.Fatal(err) |
|
| 301 |
+ } |
|
| 302 |
+ return graph, driver |
|
| 303 | 303 |
} |
| 304 | 304 |
|
| 305 | 305 |
func nukeGraph(graph *docker.Graph) {
|
| ... | ... |
@@ -47,7 +47,7 @@ func pingRegistryEndpoint(endpoint string) error {
|
| 47 | 47 |
if err != nil {
|
| 48 | 48 |
return err |
| 49 | 49 |
} |
| 50 |
- defer resp.Body.Close() |
|
| 50 |
+ defer resp.Body.Close() |
|
| 51 | 51 |
|
| 52 | 52 |
if resp.Header.Get("X-Docker-Registry-Version") == "" {
|
| 53 | 53 |
return errors.New("This does not look like a Registry server (\"X-Docker-Registry-Version\" header not found in the response)")
|
| ... | ... |
@@ -1,24 +1,24 @@ |
| 1 | 1 |
package docker |
| 2 | 2 |
|
| 3 | 3 |
import ( |
| 4 |
- "io" |
|
| 5 | 4 |
"archive/tar" |
| 6 | 5 |
"bytes" |
| 6 |
+ "io" |
|
| 7 | 7 |
) |
| 8 | 8 |
|
| 9 | 9 |
func fakeTar() (io.Reader, error) {
|
| 10 |
- content := []byte("Hello world!\n")
|
|
| 11 |
- buf := new(bytes.Buffer) |
|
| 12 |
- tw := tar.NewWriter(buf) |
|
| 13 |
- for _, name := range []string{"/etc/postgres/postgres.conf", "/etc/passwd", "/var/log/postgres/postgres.conf"} {
|
|
| 14 |
- hdr := new(tar.Header) |
|
| 15 |
- hdr.Size = int64(len(content)) |
|
| 16 |
- hdr.Name = name |
|
| 17 |
- if err := tw.WriteHeader(hdr); err != nil {
|
|
| 18 |
- return nil, err |
|
| 19 |
- } |
|
| 20 |
- tw.Write([]byte(content)) |
|
| 21 |
- } |
|
| 22 |
- tw.Close() |
|
| 23 |
- return buf, nil |
|
| 10 |
+ content := []byte("Hello world!\n")
|
|
| 11 |
+ buf := new(bytes.Buffer) |
|
| 12 |
+ tw := tar.NewWriter(buf) |
|
| 13 |
+ for _, name := range []string{"/etc/postgres/postgres.conf", "/etc/passwd", "/var/log/postgres/postgres.conf"} {
|
|
| 14 |
+ hdr := new(tar.Header) |
|
| 15 |
+ hdr.Size = int64(len(content)) |
|
| 16 |
+ hdr.Name = name |
|
| 17 |
+ if err := tw.WriteHeader(hdr); err != nil {
|
|
| 18 |
+ return nil, err |
|
| 19 |
+ } |
|
| 20 |
+ tw.Write([]byte(content)) |
|
| 21 |
+ } |
|
| 22 |
+ tw.Close() |
|
| 23 |
+ return buf, nil |
|
| 24 | 24 |
} |