mobi/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2025-11-09 13:41:11 +03:00
Code Activity

Remove use of 'bash' from our tests

Browse Source 
Not 100% sure why our Windows test don't complain about some of these,
I'm guessing it because we have bash as part of some git package, but
either way we really shouldn't require bash to run our tests unless we
really need to - which in these cases we don't

Signed-off-by: Doug Davis <dug@us.ibm.com>
This commit is contained in:
Doug Davis
2015-05-16 11:04:25 -07:00
parent b5e932a3bf
commit 3b1f73fbcd
3 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
integration-cli/docker_cli_save_load_unix_test.go
View File

@@ -4,7 +4,7 @@ package main
import (
"bytes"
"fmt"
"io/ioutil"
"os"
"os/exec"
"strings"
@@ -41,17 +41,25 @@ func (s *DockerSuite) TestSaveAndLoadRepoStdout(c *check.C) {
c.Fatalf("the repo should exist before saving it: %s, %v", before, err)
}
saveCmdTemplate := `%v save %v > /tmp/foobar-save-load-test.tar`
saveCmdFinal := fmt.Sprintf(saveCmdTemplate, dockerBinary, repoName)
saveCmd := exec.Command("bash", "-c", saveCmdFinal)
if out, _, err = runCommandWithOutput(saveCmd); err != nil {
c.Fatalf("failed to save repo: %s, %v", out, err)
tmpFile, err := ioutil.TempFile("", "foobar-save-load-test.tar")
c.Assert(err, check.IsNil)
defer os.Remove(tmpFile.Name())
saveCmd := exec.Command(dockerBinary, "save", repoName)
saveCmd.Stdout = tmpFile
if _, err = runCommand(saveCmd); err != nil {
c.Fatalf("failed to save repo: %v", err)
}
tmpFile, err = os.Open(tmpFile.Name())
c.Assert(err, check.IsNil)
deleteImages(repoName)
loadCmdFinal := `cat /tmp/foobar-save-load-test.tar | docker load`
loadCmd := exec.Command("bash", "-c", loadCmdFinal)
loadCmd := exec.Command(dockerBinary, "load")
loadCmd.Stdin = tmpFile
if out, _, err = runCommandWithOutput(loadCmd); err != nil {
c.Fatalf("failed to load repo: %s, %v", out, err)
}
@@ -69,8 +77,6 @@ func (s *DockerSuite) TestSaveAndLoadRepoStdout(c *check.C) {
deleteContainer(cleanedContainerID)
deleteImages(repoName)
os.Remove("/tmp/foobar-save-load-test.tar")
pty, tty, err := pty.Open()
if err != nil {
c.Fatalf("Could not open pty: %v", err)