Merge pull request #13282 from duglin/RemoveBash
Remove use of 'bash' from our tests
This commit is contained in:
commit
aac645ae04
|
@ -61,7 +61,8 @@ func (s *DockerSuite) TestInspectImageFilterInt(c *check.C) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *DockerSuite) TestInspectContainerFilterInt(c *check.C) {
|
func (s *DockerSuite) TestInspectContainerFilterInt(c *check.C) {
|
||||||
runCmd := exec.Command("bash", "-c", `echo "blahblah" | docker run -i -a stdin busybox cat`)
|
runCmd := exec.Command(dockerBinary, "run", "-i", "-a", "stdin", "busybox", "cat")
|
||||||
|
runCmd.Stdin = strings.NewReader("blahblah")
|
||||||
out, _, _, err := runCommandWithStdoutStderr(runCmd)
|
out, _, _, err := runCommandWithStdoutStderr(runCmd)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
c.Fatalf("failed to run container: %v, output: %q", err, out)
|
c.Fatalf("failed to run container: %v, output: %q", err, out)
|
||||||
|
|
|
@ -176,7 +176,8 @@ func (s *DockerSuite) TestRunExitCodeOne(c *check.C) {
|
||||||
// it should be possible to pipe in data via stdin to a process running in a container
|
// it should be possible to pipe in data via stdin to a process running in a container
|
||||||
// some versions of lxc might make this test fail
|
// some versions of lxc might make this test fail
|
||||||
func (s *DockerSuite) TestRunStdinPipe(c *check.C) {
|
func (s *DockerSuite) TestRunStdinPipe(c *check.C) {
|
||||||
runCmd := exec.Command("bash", "-c", `echo "blahblah" | docker run -i -a stdin busybox cat`)
|
runCmd := exec.Command(dockerBinary, "run", "-i", "-a", "stdin", "busybox", "cat")
|
||||||
|
runCmd.Stdin = strings.NewReader("blahblah")
|
||||||
out, _, _, err := runCommandWithStdoutStderr(runCmd)
|
out, _, _, err := runCommandWithStdoutStderr(runCmd)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
c.Fatalf("failed to run container: %v, output: %q", err, out)
|
c.Fatalf("failed to run container: %v, output: %q", err, out)
|
||||||
|
|
|
@ -4,7 +4,7 @@ package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"bytes"
|
"bytes"
|
||||||
"fmt"
|
"io/ioutil"
|
||||||
"os"
|
"os"
|
||||||
"os/exec"
|
"os/exec"
|
||||||
|
|
||||||
|
@ -34,17 +34,25 @@ func (s *DockerSuite) TestSaveAndLoadRepoStdout(c *check.C) {
|
||||||
c.Fatalf("the repo should exist before saving it: %s, %v", before, err)
|
c.Fatalf("the repo should exist before saving it: %s, %v", before, err)
|
||||||
}
|
}
|
||||||
|
|
||||||
saveCmdTemplate := `%v save %v > /tmp/foobar-save-load-test.tar`
|
tmpFile, err := ioutil.TempFile("", "foobar-save-load-test.tar")
|
||||||
saveCmdFinal := fmt.Sprintf(saveCmdTemplate, dockerBinary, repoName)
|
c.Assert(err, check.IsNil)
|
||||||
saveCmd := exec.Command("bash", "-c", saveCmdFinal)
|
defer os.Remove(tmpFile.Name())
|
||||||
if out, _, err = runCommandWithOutput(saveCmd); err != nil {
|
|
||||||
c.Fatalf("failed to save repo: %s, %v", out, err)
|
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)
|
deleteImages(repoName)
|
||||||
|
|
||||||
loadCmdFinal := `cat /tmp/foobar-save-load-test.tar | docker load`
|
loadCmd := exec.Command(dockerBinary, "load")
|
||||||
loadCmd := exec.Command("bash", "-c", loadCmdFinal)
|
loadCmd.Stdin = tmpFile
|
||||||
|
|
||||||
if out, _, err = runCommandWithOutput(loadCmd); err != nil {
|
if out, _, err = runCommandWithOutput(loadCmd); err != nil {
|
||||||
c.Fatalf("failed to load repo: %s, %v", out, err)
|
c.Fatalf("failed to load repo: %s, %v", out, err)
|
||||||
}
|
}
|
||||||
|
@ -61,8 +69,6 @@ func (s *DockerSuite) TestSaveAndLoadRepoStdout(c *check.C) {
|
||||||
|
|
||||||
deleteImages(repoName)
|
deleteImages(repoName)
|
||||||
|
|
||||||
os.Remove("/tmp/foobar-save-load-test.tar")
|
|
||||||
|
|
||||||
pty, tty, err := pty.Open()
|
pty, tty, err := pty.Open()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
c.Fatalf("Could not open pty: %v", err)
|
c.Fatalf("Could not open pty: %v", err)
|
||||||
|
|
Loading…
Reference in New Issue