@@ -212,7 +212,7 @@ func (s *DockerSuite) TestGetContainerStats(c *check.C) {

 }

 func (s *DockerSuite) TestGetContainerStatsRmRunning(c *check.C) {

-	out, _ := runSleepingContainer(c)

+	out := runSleepingContainer(c)

 	id := strings.TrimSpace(out)

 	buf := &testutil.ChannelBuffer{C: make(chan []byte, 1)}

@@ -401,7 +401,7 @@ func (s *DockerSuite) TestContainerAPITop(c *check.C) {

 func (s *DockerSuite) TestContainerAPITopWindows(c *check.C) {

 	testRequires(c, DaemonIsWindows)

-	out, _ := runSleepingContainer(c, "-d")

+	out := runSleepingContainer(c, "-d")

 	id := strings.TrimSpace(string(out))

 	c.Assert(waitRun(id), checker.IsNil)

@@ -892,7 +892,7 @@ func (s *DockerSuite) TestContainerAPIRestart(c *check.C) {

 func (s *DockerSuite) TestContainerAPIRestartNotimeoutParam(c *check.C) {

 	name := "test-api-restart-no-timeout-param"

-	out, _ := runSleepingContainer(c, "-di", "--name", name)

+	out := runSleepingContainer(c, "-di", "--name", name)

 	id := strings.TrimSpace(out)

 	c.Assert(waitRun(id), checker.IsNil)

@@ -1047,7 +1047,7 @@ func (s *DockerSuite) TestContainerAPICopyContainerNotFoundPr124(c *check.C) {

 }

 func (s *DockerSuite) TestContainerAPIDelete(c *check.C) {

-	out, _ := runSleepingContainer(c)

+	out := runSleepingContainer(c)

 	id := strings.TrimSpace(out)

 	c.Assert(waitRun(id), checker.IsNil)

@@ -1067,7 +1067,7 @@ func (s *DockerSuite) TestContainerAPIDeleteNotExist(c *check.C) {

 }

 func (s *DockerSuite) TestContainerAPIDeleteForce(c *check.C) {

-	out, _ := runSleepingContainer(c)

+	out := runSleepingContainer(c)

 	id := strings.TrimSpace(out)

 	c.Assert(waitRun(id), checker.IsNil)

@@ -1102,7 +1102,7 @@ func (s *DockerSuite) TestContainerAPIDeleteRemoveLinks(c *check.C) {

 }

 func (s *DockerSuite) TestContainerAPIDeleteConflict(c *check.C) {

-	out, _ := runSleepingContainer(c)

+	out := runSleepingContainer(c)

 	id := strings.TrimSpace(out)

 	c.Assert(waitRun(id), checker.IsNil)

@@ -1120,7 +1120,7 @@ func (s *DockerSuite) TestContainerAPIDeleteRemoveVolume(c *check.C) {

 		vol = `c:\testvolume`

 	}

-	out, _ := runSleepingContainer(c, "-v", vol)

+	out := runSleepingContainer(c, "-v", vol)

 	id := strings.TrimSpace(out)

 	c.Assert(waitRun(id), checker.IsNil)

@@ -1158,7 +1158,7 @@ func (s *DockerSuite) TestContainerAPIChunkedEncoding(c *check.C) {

 }

 func (s *DockerSuite) TestContainerAPIPostContainerStop(c *check.C) {

-	out, _ := runSleepingContainer(c)

+	out := runSleepingContainer(c)

 	containerID := strings.TrimSpace(out)

 	c.Assert(waitRun(containerID), checker.IsNil)

@@ -40,7 +40,7 @@ func (s *DockerSuite) TestEventsAPIBackwardsCompatible(c *check.C) {

 	since := daemonTime(c).Unix()

 	ts := strconv.FormatInt(since, 10)

-	out, _ := runSleepingContainer(c, "--name=foo", "-d")

+	out := runSleepingContainer(c, "--name=foo", "-d")

 	containerID := strings.TrimSpace(out)

 	c.Assert(waitRun(containerID), checker.IsNil)

@@ -10,7 +10,7 @@ import (

 )

 func (s *DockerSuite) TestResizeAPIResponse(c *check.C) {

-	out, _ := runSleepingContainer(c, "-d")

+	out := runSleepingContainer(c, "-d")

 	cleanedContainerID := strings.TrimSpace(out)

 	endpoint := "/containers/" + cleanedContainerID + "/resize?h=40&w=40"

@@ -20,7 +20,7 @@ func (s *DockerSuite) TestResizeAPIResponse(c *check.C) {

 }

 func (s *DockerSuite) TestResizeAPIHeightWidthNoInt(c *check.C) {

-	out, _ := runSleepingContainer(c, "-d")

+	out := runSleepingContainer(c, "-d")

 	cleanedContainerID := strings.TrimSpace(out)

 	endpoint := "/containers/" + cleanedContainerID + "/resize?h=foo&w=bar"

@@ -98,7 +98,7 @@ func (s *DockerSuite) TestAPIStatsStoppedContainerInGoroutines(c *check.C) {

 func (s *DockerSuite) TestAPIStatsNetworkStats(c *check.C) {

 	testRequires(c, SameHostDaemon)

-	out, _ := runSleepingContainer(c)

+	out := runSleepingContainer(c)

 	id := strings.TrimSpace(out)

 	c.Assert(waitRun(id), checker.IsNil)

@@ -166,7 +166,7 @@ func (s *DockerSuite) TestAPIStatsNetworkStatsVersioning(c *check.C) {

 	// Windows doesn't support API versions less than 1.25, so no point testing 1.17 .. 1.21

 	testRequires(c, SameHostDaemon, DaemonIsLinux)

-	out, _ := runSleepingContainer(c)

+	out := runSleepingContainer(c)

 	id := strings.TrimSpace(out)

 	c.Assert(waitRun(id), checker.IsNil)

 	wg := sync.WaitGroup{}

@@ -274,11 +274,11 @@ func (s *DockerSuite) TestAPIStatsContainerNotFound(c *check.C) {

 func (s *DockerSuite) TestAPIStatsNoStreamConnectedContainers(c *check.C) {

 	testRequires(c, DaemonIsLinux)

-	out1, _ := runSleepingContainer(c)

+	out1 := runSleepingContainer(c)

 	id1 := strings.TrimSpace(out1)

 	c.Assert(waitRun(id1), checker.IsNil)

-	out2, _ := runSleepingContainer(c, "--net", "container:"+id1)

+	out2 := runSleepingContainer(c, "--net", "container:"+id1)

 	id2 := strings.TrimSpace(out2)

 	c.Assert(waitRun(id2), checker.IsNil)

deleted file mode 100644

@@ -1,319 +0,0 @@

-package main

-

-import (

-	"bytes"

-	"fmt"

-	"io/ioutil"

-	"os"

-	"os/exec"

-	"path/filepath"

-	"runtime"

-	"strings"

-

-	"github.com/docker/docker/integration-cli/checker"

-	"github.com/docker/docker/pkg/archive"

-	"github.com/go-check/check"

-)

-

-type fileType uint32

-

-const (

-	ftRegular fileType = iota

-	ftDir

-	ftSymlink

-)

-

-type fileData struct {

-	filetype fileType

-	path     string

-	contents string

-	uid      int

-	gid      int

-	mode     int

-}

-

-func (fd fileData) creationCommand() string {

-	var command string

-

-	switch fd.filetype {

-	case ftRegular:

-		// Don't overwrite the file if it already exists!

-		command = fmt.Sprintf("if [ ! -f %s ]; then echo %q > %s; fi", fd.path, fd.contents, fd.path)

-	case ftDir:

-		command = fmt.Sprintf("mkdir -p %s", fd.path)

-	case ftSymlink:

-		command = fmt.Sprintf("ln -fs %s %s", fd.contents, fd.path)

-	}

-

-	return command

-}

-

-func mkFilesCommand(fds []fileData) string {

-	commands := make([]string, len(fds))

-

-	for i, fd := range fds {

-		commands[i] = fd.creationCommand()

-	}

-

-	return strings.Join(commands, " && ")

-}

-

-var defaultFileData = []fileData{

-	{ftRegular, "file1", "file1", 0, 0, 0666},

-	{ftRegular, "file2", "file2", 0, 0, 0666},

-	{ftRegular, "file3", "file3", 0, 0, 0666},

-	{ftRegular, "file4", "file4", 0, 0, 0666},

-	{ftRegular, "file5", "file5", 0, 0, 0666},

-	{ftRegular, "file6", "file6", 0, 0, 0666},

-	{ftRegular, "file7", "file7", 0, 0, 0666},

-	{ftDir, "dir1", "", 0, 0, 0777},

-	{ftRegular, "dir1/file1-1", "file1-1", 0, 0, 0666},

-	{ftRegular, "dir1/file1-2", "file1-2", 0, 0, 0666},

-	{ftDir, "dir2", "", 0, 0, 0666},

-	{ftRegular, "dir2/file2-1", "file2-1", 0, 0, 0666},

-	{ftRegular, "dir2/file2-2", "file2-2", 0, 0, 0666},

-	{ftDir, "dir3", "", 0, 0, 0666},

-	{ftRegular, "dir3/file3-1", "file3-1", 0, 0, 0666},

-	{ftRegular, "dir3/file3-2", "file3-2", 0, 0, 0666},

-	{ftDir, "dir4", "", 0, 0, 0666},

-	{ftRegular, "dir4/file3-1", "file4-1", 0, 0, 0666},

-	{ftRegular, "dir4/file3-2", "file4-2", 0, 0, 0666},

-	{ftDir, "dir5", "", 0, 0, 0666},

-	{ftSymlink, "symlinkToFile1", "file1", 0, 0, 0666},

-	{ftSymlink, "symlinkToDir1", "dir1", 0, 0, 0666},

-	{ftSymlink, "brokenSymlinkToFileX", "fileX", 0, 0, 0666},

-	{ftSymlink, "brokenSymlinkToDirX", "dirX", 0, 0, 0666},

-	{ftSymlink, "symlinkToAbsDir", "/root", 0, 0, 0666},

-	{ftDir, "permdirtest", "", 2, 2, 0700},

-	{ftRegular, "permdirtest/permtest", "perm_test", 65534, 65534, 0400},

-}

-

-func defaultMkContentCommand() string {

-	return mkFilesCommand(defaultFileData)

-}

-

-func makeTestContentInDir(c *check.C, dir string) {

-	for _, fd := range defaultFileData {

-		path := filepath.Join(dir, filepath.FromSlash(fd.path))

-		switch fd.filetype {

-		case ftRegular:

-			c.Assert(ioutil.WriteFile(path, []byte(fd.contents+"\n"), os.FileMode(fd.mode)), checker.IsNil)

-		case ftDir:

-			c.Assert(os.Mkdir(path, os.FileMode(fd.mode)), checker.IsNil)

-		case ftSymlink:

-			c.Assert(os.Symlink(fd.contents, path), checker.IsNil)

-		}

-

-		if fd.filetype != ftSymlink && runtime.GOOS != "windows" {

-			c.Assert(os.Chown(path, fd.uid, fd.gid), checker.IsNil)

-		}

-	}

-}

-

-type testContainerOptions struct {

-	addContent bool

-	readOnly   bool

-	volumes    []string

-	workDir    string

-	command    string

-}

-

-func makeTestContainer(c *check.C, options testContainerOptions) (containerID string) {

-	if options.addContent {

-		mkContentCmd := defaultMkContentCommand()

-		if options.command == "" {

-			options.command = mkContentCmd

-		} else {

-			options.command = fmt.Sprintf("%s && %s", defaultMkContentCommand(), options.command)

-		}

-	}

-

-	if options.command == "" {

-		options.command = "#(nop)"

-	}

-

-	args := []string{"run", "-d"}

-

-	for _, volume := range options.volumes {

-		args = append(args, "-v", volume)

-	}

-

-	if options.workDir != "" {

-		args = append(args, "-w", options.workDir)

-	}

-

-	if options.readOnly {

-		args = append(args, "--read-only")

-	}

-

-	args = append(args, "busybox", "/bin/sh", "-c", options.command)

-

-	out, _ := dockerCmd(c, args...)

-

-	containerID = strings.TrimSpace(out)

-

-	out, _ = dockerCmd(c, "wait", containerID)

-

-	exitCode := strings.TrimSpace(out)

-	if exitCode != "0" {

-		out, _ = dockerCmd(c, "logs", containerID)

-	}

-	c.Assert(exitCode, checker.Equals, "0", check.Commentf("failed to make test container: %s", out))

-

-	return

-}

-

-func makeCatFileCommand(path string) string {

-	return fmt.Sprintf("if [ -f %s ]; then cat %s; fi", path, path)

-}

-

-func cpPath(pathElements ...string) string {

-	localizedPathElements := make([]string, len(pathElements))

-	for i, path := range pathElements {

-		localizedPathElements[i] = filepath.FromSlash(path)

-	}

-	return strings.Join(localizedPathElements, string(filepath.Separator))

-}

-

-func cpPathTrailingSep(pathElements ...string) string {

-	return fmt.Sprintf("%s%c", cpPath(pathElements...), filepath.Separator)

-}

-

-func containerCpPath(containerID string, pathElements ...string) string {

-	joined := strings.Join(pathElements, "/")

-	return fmt.Sprintf("%s:%s", containerID, joined)

-}

-

-func containerCpPathTrailingSep(containerID string, pathElements ...string) string {

-	return fmt.Sprintf("%s/", containerCpPath(containerID, pathElements...))

-}

-

-func runDockerCp(c *check.C, src, dst string, params []string) (err error) {

-	c.Logf("running `docker cp %s %s %s`", strings.Join(params, " "), src, dst)

-

-	args := []string{"cp"}

-

-	for _, param := range params {

-		args = append(args, param)

-	}

-

-	args = append(args, src, dst)

-

-	out, _, err := runCommandWithOutput(exec.Command(dockerBinary, args...))

-	if err != nil {

-		err = fmt.Errorf("error executing `docker cp` command: %s: %s", err, out)

-	}

-

-	return

-}

-

-func startContainerGetOutput(c *check.C, containerID string) (out string, err error) {

-	c.Logf("running `docker start -a %s`", containerID)

-

-	args := []string{"start", "-a", containerID}

-

-	out, _, err = runCommandWithOutput(exec.Command(dockerBinary, args...))

-	if err != nil {

-		err = fmt.Errorf("error executing `docker start` command: %s: %s", err, out)

-	}

-

-	return

-}

-

-func getTestDir(c *check.C, label string) (tmpDir string) {

-	var err error

-

-	tmpDir, err = ioutil.TempDir("", label)

-	// unable to make temporary directory

-	c.Assert(err, checker.IsNil)

-

-	return

-}

-

-func isCpNotExist(err error) bool {

-	return strings.Contains(err.Error(), "no such file or directory") || strings.Contains(err.Error(), "cannot find the file specified")

-}

-

-func isCpDirNotExist(err error) bool {

-	return strings.Contains(err.Error(), archive.ErrDirNotExists.Error())

-}

-

-func isCpNotDir(err error) bool {

-	return strings.Contains(err.Error(), archive.ErrNotDirectory.Error()) || strings.Contains(err.Error(), "filename, directory name, or volume label syntax is incorrect")

-}

-

-func isCpCannotCopyDir(err error) bool {

-	return strings.Contains(err.Error(), archive.ErrCannotCopyDir.Error())

-}

-

-func isCpCannotCopyReadOnly(err error) bool {

-	return strings.Contains(err.Error(), "marked read-only")

-}

-

-func isCannotOverwriteNonDirWithDir(err error) bool {

-	return strings.Contains(err.Error(), "cannot overwrite non-directory")

-}

-

-func fileContentEquals(c *check.C, filename, contents string) (err error) {

-	c.Logf("checking that file %q contains %q\n", filename, contents)

-

-	fileBytes, err := ioutil.ReadFile(filename)

-	if err != nil {

-		return

-	}

-

-	expectedBytes, err := ioutil.ReadAll(strings.NewReader(contents))

-	if err != nil {

-		return

-	}

-

-	if !bytes.Equal(fileBytes, expectedBytes) {

-		err = fmt.Errorf("file content not equal - expected %q, got %q", string(expectedBytes), string(fileBytes))

-	}

-

-	return

-}

-

-func symlinkTargetEquals(c *check.C, symlink, expectedTarget string) (err error) {

-	c.Logf("checking that the symlink %q points to %q\n", symlink, expectedTarget)

-

-	actualTarget, err := os.Readlink(symlink)

-	if err != nil {

-		return

-	}

-

-	if actualTarget != expectedTarget {

-		err = fmt.Errorf("symlink target points to %q not %q", actualTarget, expectedTarget)

-	}

-

-	return

-}

-

-func containerStartOutputEquals(c *check.C, containerID, contents string) (err error) {

-	c.Logf("checking that container %q start output contains %q\n", containerID, contents)

-

-	out, err := startContainerGetOutput(c, containerID)

-	if err != nil {

-		return

-	}

-

-	if out != contents {

-		err = fmt.Errorf("output contents not equal - expected %q, got %q", contents, out)

-	}

-

-	return

-}

-

-func defaultVolumes(tmpDir string) []string {

-	if SameHostDaemon() {

-		return []string{

-			"/vol1",

-			fmt.Sprintf("%s:/vol2", tmpDir),

-			fmt.Sprintf("%s:/vol3", filepath.Join(tmpDir, "vol3")),

-			fmt.Sprintf("%s:/vol_ro:ro", filepath.Join(tmpDir, "vol_ro")),

-		}

-	}

-

-	// Can't bind-mount volumes with separate host daemon.

-	return []string{"/vol1", "/vol2", "/vol3", "/vol_ro:/vol_ro:ro"}

-}

new file mode 100644

@@ -0,0 +1,319 @@

+package main

+

+import (

+	"bytes"

+	"fmt"

+	"io/ioutil"

+	"os"

+	"os/exec"

+	"path/filepath"

+	"runtime"

+	"strings"

+

+	"github.com/docker/docker/integration-cli/checker"

+	"github.com/docker/docker/pkg/archive"

+	"github.com/go-check/check"

+)

+

+type fileType uint32

+

+const (

+	ftRegular fileType = iota

+	ftDir

+	ftSymlink

+)

+

+type fileData struct {

+	filetype fileType

+	path     string

+	contents string

+	uid      int

+	gid      int

+	mode     int

+}

+

+func (fd fileData) creationCommand() string {

+	var command string

+

+	switch fd.filetype {

+	case ftRegular:

+		// Don't overwrite the file if it already exists!

+		command = fmt.Sprintf("if [ ! -f %s ]; then echo %q > %s; fi", fd.path, fd.contents, fd.path)

+	case ftDir:

+		command = fmt.Sprintf("mkdir -p %s", fd.path)

+	case ftSymlink:

+		command = fmt.Sprintf("ln -fs %s %s", fd.contents, fd.path)

+	}

+

+	return command

+}

+

+func mkFilesCommand(fds []fileData) string {

+	commands := make([]string, len(fds))

+

+	for i, fd := range fds {

+		commands[i] = fd.creationCommand()

+	}

+

+	return strings.Join(commands, " && ")

+}

+

+var defaultFileData = []fileData{

+	{ftRegular, "file1", "file1", 0, 0, 0666},

+	{ftRegular, "file2", "file2", 0, 0, 0666},

+	{ftRegular, "file3", "file3", 0, 0, 0666},

+	{ftRegular, "file4", "file4", 0, 0, 0666},

+	{ftRegular, "file5", "file5", 0, 0, 0666},

+	{ftRegular, "file6", "file6", 0, 0, 0666},

+	{ftRegular, "file7", "file7", 0, 0, 0666},

+	{ftDir, "dir1", "", 0, 0, 0777},

+	{ftRegular, "dir1/file1-1", "file1-1", 0, 0, 0666},

+	{ftRegular, "dir1/file1-2", "file1-2", 0, 0, 0666},

+	{ftDir, "dir2", "", 0, 0, 0666},

+	{ftRegular, "dir2/file2-1", "file2-1", 0, 0, 0666},

+	{ftRegular, "dir2/file2-2", "file2-2", 0, 0, 0666},

+	{ftDir, "dir3", "", 0, 0, 0666},

+	{ftRegular, "dir3/file3-1", "file3-1", 0, 0, 0666},

+	{ftRegular, "dir3/file3-2", "file3-2", 0, 0, 0666},

+	{ftDir, "dir4", "", 0, 0, 0666},

+	{ftRegular, "dir4/file3-1", "file4-1", 0, 0, 0666},

+	{ftRegular, "dir4/file3-2", "file4-2", 0, 0, 0666},

+	{ftDir, "dir5", "", 0, 0, 0666},

+	{ftSymlink, "symlinkToFile1", "file1", 0, 0, 0666},

+	{ftSymlink, "symlinkToDir1", "dir1", 0, 0, 0666},

+	{ftSymlink, "brokenSymlinkToFileX", "fileX", 0, 0, 0666},

+	{ftSymlink, "brokenSymlinkToDirX", "dirX", 0, 0, 0666},

+	{ftSymlink, "symlinkToAbsDir", "/root", 0, 0, 0666},

+	{ftDir, "permdirtest", "", 2, 2, 0700},

+	{ftRegular, "permdirtest/permtest", "perm_test", 65534, 65534, 0400},

+}

+

+func defaultMkContentCommand() string {

+	return mkFilesCommand(defaultFileData)

+}

+

+func makeTestContentInDir(c *check.C, dir string) {

+	for _, fd := range defaultFileData {

+		path := filepath.Join(dir, filepath.FromSlash(fd.path))

+		switch fd.filetype {

+		case ftRegular:

+			c.Assert(ioutil.WriteFile(path, []byte(fd.contents+"\n"), os.FileMode(fd.mode)), checker.IsNil)

+		case ftDir:

+			c.Assert(os.Mkdir(path, os.FileMode(fd.mode)), checker.IsNil)

+		case ftSymlink:

+			c.Assert(os.Symlink(fd.contents, path), checker.IsNil)

+		}

+

+		if fd.filetype != ftSymlink && runtime.GOOS != "windows" {

+			c.Assert(os.Chown(path, fd.uid, fd.gid), checker.IsNil)

+		}

+	}

+}

+

+type testContainerOptions struct {

+	addContent bool

+	readOnly   bool

+	volumes    []string

+	workDir    string

+	command    string

+}

+

+func makeTestContainer(c *check.C, options testContainerOptions) (containerID string) {

+	if options.addContent {

+		mkContentCmd := defaultMkContentCommand()

+		if options.command == "" {

+			options.command = mkContentCmd

+		} else {

+			options.command = fmt.Sprintf("%s && %s", defaultMkContentCommand(), options.command)

+		}

+	}

+

+	if options.command == "" {

+		options.command = "#(nop)"

+	}

+

+	args := []string{"run", "-d"}

+

+	for _, volume := range options.volumes {

+		args = append(args, "-v", volume)

+	}

+

+	if options.workDir != "" {

+		args = append(args, "-w", options.workDir)

+	}

+

+	if options.readOnly {

+		args = append(args, "--read-only")

+	}

+

+	args = append(args, "busybox", "/bin/sh", "-c", options.command)

+

+	out, _ := dockerCmd(c, args...)

+

+	containerID = strings.TrimSpace(out)

+

+	out, _ = dockerCmd(c, "wait", containerID)

+

+	exitCode := strings.TrimSpace(out)

+	if exitCode != "0" {

+		out, _ = dockerCmd(c, "logs", containerID)

+	}

+	c.Assert(exitCode, checker.Equals, "0", check.Commentf("failed to make test container: %s", out))

+

+	return

+}

+

+func makeCatFileCommand(path string) string {

+	return fmt.Sprintf("if [ -f %s ]; then cat %s; fi", path, path)

+}

+

+func cpPath(pathElements ...string) string {

+	localizedPathElements := make([]string, len(pathElements))

+	for i, path := range pathElements {

+		localizedPathElements[i] = filepath.FromSlash(path)

+	}

+	return strings.Join(localizedPathElements, string(filepath.Separator))

+}

+

+func cpPathTrailingSep(pathElements ...string) string {

+	return fmt.Sprintf("%s%c", cpPath(pathElements...), filepath.Separator)

+}

+

+func containerCpPath(containerID string, pathElements ...string) string {

+	joined := strings.Join(pathElements, "/")

+	return fmt.Sprintf("%s:%s", containerID, joined)

+}

+

+func containerCpPathTrailingSep(containerID string, pathElements ...string) string {

+	return fmt.Sprintf("%s/", containerCpPath(containerID, pathElements...))

+}

+

+func runDockerCp(c *check.C, src, dst string, params []string) (err error) {

+	c.Logf("running `docker cp %s %s %s`", strings.Join(params, " "), src, dst)

+

+	args := []string{"cp"}

+

+	for _, param := range params {

+		args = append(args, param)

+	}

+

+	args = append(args, src, dst)

+

+	out, _, err := runCommandWithOutput(exec.Command(dockerBinary, args...))

+	if err != nil {

+		err = fmt.Errorf("error executing `docker cp` command: %s: %s", err, out)

+	}

+

+	return

+}

+

+func startContainerGetOutput(c *check.C, containerID string) (out string, err error) {

+	c.Logf("running `docker start -a %s`", containerID)

+

+	args := []string{"start", "-a", containerID}

+

+	out, _, err = runCommandWithOutput(exec.Command(dockerBinary, args...))

+	if err != nil {

+		err = fmt.Errorf("error executing `docker start` command: %s: %s", err, out)

+	}

+

+	return

+}

+

+func getTestDir(c *check.C, label string) (tmpDir string) {

+	var err error

+

+	tmpDir, err = ioutil.TempDir("", label)

+	// unable to make temporary directory

+	c.Assert(err, checker.IsNil)

+

+	return

+}

+

+func isCpNotExist(err error) bool {

+	return strings.Contains(err.Error(), "no such file or directory") || strings.Contains(err.Error(), "cannot find the file specified")

+}

+

+func isCpDirNotExist(err error) bool {

+	return strings.Contains(err.Error(), archive.ErrDirNotExists.Error())

+}

+

+func isCpNotDir(err error) bool {

+	return strings.Contains(err.Error(), archive.ErrNotDirectory.Error()) || strings.Contains(err.Error(), "filename, directory name, or volume label syntax is incorrect")

+}

+

+func isCpCannotCopyDir(err error) bool {

+	return strings.Contains(err.Error(), archive.ErrCannotCopyDir.Error())

+}

+

+func isCpCannotCopyReadOnly(err error) bool {

+	return strings.Contains(err.Error(), "marked read-only")

+}

+

+func isCannotOverwriteNonDirWithDir(err error) bool {

+	return strings.Contains(err.Error(), "cannot overwrite non-directory")

+}

+

+func fileContentEquals(c *check.C, filename, contents string) (err error) {

+	c.Logf("checking that file %q contains %q\n", filename, contents)

+

+	fileBytes, err := ioutil.ReadFile(filename)

+	if err != nil {

+		return

+	}

+

+	expectedBytes, err := ioutil.ReadAll(strings.NewReader(contents))

+	if err != nil {

+		return

+	}

+

+	if !bytes.Equal(fileBytes, expectedBytes) {

+		err = fmt.Errorf("file content not equal - expected %q, got %q", string(expectedBytes), string(fileBytes))

+	}

+

+	return

+}

+

+func symlinkTargetEquals(c *check.C, symlink, expectedTarget string) (err error) {

+	c.Logf("checking that the symlink %q points to %q\n", symlink, expectedTarget)

+

+	actualTarget, err := os.Readlink(symlink)

+	if err != nil {

+		return

+	}

+

+	if actualTarget != expectedTarget {

+		err = fmt.Errorf("symlink target points to %q not %q", actualTarget, expectedTarget)

+	}

+

+	return

+}

+

+func containerStartOutputEquals(c *check.C, containerID, contents string) (err error) {

+	c.Logf("checking that container %q start output contains %q\n", containerID, contents)

+

+	out, err := startContainerGetOutput(c, containerID)

+	if err != nil {

+		return

+	}

+

+	if out != contents {

+		err = fmt.Errorf("output contents not equal - expected %q, got %q", contents, out)

+	}

+

+	return

+}

+

+func defaultVolumes(tmpDir string) []string {

+	if SameHostDaemon() {

+		return []string{

+			"/vol1",

+			fmt.Sprintf("%s:/vol2", tmpDir),

+			fmt.Sprintf("%s:/vol3", filepath.Join(tmpDir, "vol3")),

+			fmt.Sprintf("%s:/vol_ro:ro", filepath.Join(tmpDir, "vol_ro")),

+		}

+	}

+

+	// Can't bind-mount volumes with separate host daemon.

+	return []string{"/vol1", "/vol2", "/vol3", "/vol_ro:/vol_ro:ro"}

+}

@@ -452,7 +452,7 @@ func (s *DockerSuite) TestEventsCommit(c *check.C) {

 	// Problematic on Windows as cannot commit a running container

 	testRequires(c, DaemonIsLinux)

-	out, _ := runSleepingContainer(c)

+	out := runSleepingContainer(c)

 	cID := strings.TrimSpace(out)

 	cli.WaitRun(c, cID)

@@ -495,7 +495,7 @@ func (s *DockerSuite) TestEventsCopy(c *check.C) {

 }

 func (s *DockerSuite) TestEventsResize(c *check.C) {

-	out, _ := runSleepingContainer(c, "-d")

+	out := runSleepingContainer(c, "-d")

 	cID := strings.TrimSpace(out)

 	c.Assert(waitRun(cID), checker.IsNil)

@@ -561,7 +561,7 @@ func (s *DockerSuite) TestEventsTop(c *check.C) {

 	// Problematic on Windows as Windows does not support top

 	testRequires(c, DaemonIsLinux)

-	out, _ := runSleepingContainer(c, "-d")

+	out := runSleepingContainer(c, "-d")

 	cID := strings.TrimSpace(out)

 	c.Assert(waitRun(cID), checker.IsNil)

@@ -71,7 +71,7 @@ func (s *DockerSuite) TestExecInteractive(c *check.C) {

 }

 func (s *DockerSuite) TestExecAfterContainerRestart(c *check.C) {

-	out, _ := runSleepingContainer(c)

+	out := runSleepingContainer(c)

 	cleanedContainerID := strings.TrimSpace(out)

 	c.Assert(waitRun(cleanedContainerID), check.IsNil)

 	dockerCmd(c, "restart", cleanedContainerID)

@@ -139,7 +139,7 @@ func (s *DockerSuite) TestExecExitStatus(c *check.C) {

 func (s *DockerSuite) TestExecPausedContainer(c *check.C) {

 	testRequires(c, IsPausable)

-	out, _ := runSleepingContainer(c, "-d", "--name", "testing")

+	out := runSleepingContainer(c, "-d", "--name", "testing")

 	ContainerID := strings.TrimSpace(out)

 	dockerCmd(c, "pause", "testing")

@@ -305,7 +305,7 @@ func (s *DockerSuite) TestExecCgroup(c *check.C) {

 }

 func (s *DockerSuite) TestExecInspectID(c *check.C) {

-	out, _ := runSleepingContainer(c, "-d")

+	out := runSleepingContainer(c, "-d")

 	id := strings.TrimSuffix(out, "\n")

 	out = inspectField(c, id, "ExecIDs")

@@ -146,7 +146,7 @@ func (s *DockerSuite) TestInfoDisplaysRunningContainers(c *check.C) {

 func (s *DockerSuite) TestInfoDisplaysPausedContainers(c *check.C) {

 	testRequires(c, IsPausable)

-	out, _ := runSleepingContainer(c, "-d")

+	out := runSleepingContainer(c, "-d")

 	cleanedContainerID := strings.TrimSpace(out)

 	dockerCmd(c, "pause", cleanedContainerID)

@@ -53,7 +53,7 @@ func (s *DockerSuite) TestInspectDefault(c *check.C) {

 }

 func (s *DockerSuite) TestInspectStatus(c *check.C) {

-	out, _ := runSleepingContainer(c, "-d")

+	out := runSleepingContainer(c, "-d")

 	out = strings.TrimSpace(out)

 	inspectOut := inspectField(c, out, "State.Status")

@@ -14,7 +14,7 @@ import (

 )

 func (s *DockerSuite) TestKillContainer(c *check.C) {

-	out, _ := runSleepingContainer(c, "-d")

+	out := runSleepingContainer(c, "-d")

 	cleanedContainerID := strings.TrimSpace(out)

 	cli.WaitRun(c, cleanedContainerID)

@@ -27,7 +27,7 @@ func (s *DockerSuite) TestKillContainer(c *check.C) {

 }

 func (s *DockerSuite) TestKillOffStoppedContainer(c *check.C) {

-	out, _ := runSleepingContainer(c, "-d")

+	out := runSleepingContainer(c, "-d")

 	cleanedContainerID := strings.TrimSpace(out)

 	cli.DockerCmd(c, "stop", cleanedContainerID)

@@ -103,7 +103,7 @@ func (s *DockerSuite) TestKillWithStopSignalWithDifferentSignalShouldKeepRestart

 // FIXME(vdemeester) should be a unit test

 func (s *DockerSuite) TestKillWithInvalidSignal(c *check.C) {

-	out, _ := runSleepingContainer(c, "-d")

+	out := runSleepingContainer(c, "-d")

 	cid := strings.TrimSpace(out)

 	c.Assert(waitRun(cid), check.IsNil)