mirror of
				https://github.com/moby/moby.git
				synced 2022-11-09 12:21:53 -05:00 
			
		
		
		
	go fmt.
result of `gofmt -w -s .` without vendors.
This commit is contained in:
		
							parent
							
								
									82cecb34b5
								
							
						
					
					
						commit
						fe72f15e4a
					
				
					 3 changed files with 29 additions and 29 deletions
				
			
		| 
						 | 
				
			
			@ -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) {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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)")
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue