update save-load-unix-test
Signed-off-by: xlgao-zju <xlgao@zju.edu.cn>
This commit is contained in:
parent
e7ef8633d5
commit
8d98b37031
|
@ -3,11 +3,11 @@
|
||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"bytes"
|
|
||||||
"io/ioutil"
|
"io/ioutil"
|
||||||
"os"
|
"os"
|
||||||
"os/exec"
|
"os/exec"
|
||||||
|
|
||||||
|
"github.com/docker/docker/pkg/integration/checker"
|
||||||
"github.com/go-check/check"
|
"github.com/go-check/check"
|
||||||
"github.com/kr/pty"
|
"github.com/kr/pty"
|
||||||
)
|
)
|
||||||
|
@ -29,9 +29,8 @@ func (s *DockerSuite) TestSaveAndLoadRepoStdout(c *check.C) {
|
||||||
saveCmd := exec.Command(dockerBinary, "save", repoName)
|
saveCmd := exec.Command(dockerBinary, "save", repoName)
|
||||||
saveCmd.Stdout = tmpFile
|
saveCmd.Stdout = tmpFile
|
||||||
|
|
||||||
if _, err = runCommand(saveCmd); err != nil {
|
_, err = runCommand(saveCmd)
|
||||||
c.Fatalf("failed to save repo: %v", err)
|
c.Assert(err, check.IsNil)
|
||||||
}
|
|
||||||
|
|
||||||
tmpFile, err = os.Open(tmpFile.Name())
|
tmpFile, err = os.Open(tmpFile.Name())
|
||||||
c.Assert(err, check.IsNil)
|
c.Assert(err, check.IsNil)
|
||||||
|
@ -41,41 +40,27 @@ func (s *DockerSuite) TestSaveAndLoadRepoStdout(c *check.C) {
|
||||||
loadCmd := exec.Command(dockerBinary, "load")
|
loadCmd := exec.Command(dockerBinary, "load")
|
||||||
loadCmd.Stdin = tmpFile
|
loadCmd.Stdin = tmpFile
|
||||||
|
|
||||||
if out, _, err = runCommandWithOutput(loadCmd); err != nil {
|
out, _, err = runCommandWithOutput(loadCmd)
|
||||||
c.Fatalf("failed to load repo: %s, %v", out, err)
|
c.Assert(err, check.IsNil, check.Commentf(out))
|
||||||
}
|
|
||||||
|
|
||||||
after, _ := dockerCmd(c, "inspect", repoName)
|
after, _ := dockerCmd(c, "inspect", repoName)
|
||||||
|
|
||||||
if before != after {
|
c.Assert(before, check.Equals, after) //inspect is not the same after a save / load
|
||||||
c.Fatalf("inspect is not the same after a save / load")
|
|
||||||
}
|
|
||||||
|
|
||||||
deleteImages(repoName)
|
deleteImages(repoName)
|
||||||
|
|
||||||
pty, tty, err := pty.Open()
|
pty, tty, err := pty.Open()
|
||||||
if err != nil {
|
c.Assert(err, check.IsNil)
|
||||||
c.Fatalf("Could not open pty: %v", err)
|
|
||||||
}
|
|
||||||
cmd := exec.Command(dockerBinary, "save", repoName)
|
cmd := exec.Command(dockerBinary, "save", repoName)
|
||||||
cmd.Stdin = tty
|
cmd.Stdin = tty
|
||||||
cmd.Stdout = tty
|
cmd.Stdout = tty
|
||||||
cmd.Stderr = tty
|
cmd.Stderr = tty
|
||||||
if err := cmd.Start(); err != nil {
|
c.Assert(cmd.Start(), check.IsNil)
|
||||||
c.Fatalf("start err: %v", err)
|
c.Assert(cmd.Wait(), check.NotNil) //did not break writing to a TTY
|
||||||
}
|
|
||||||
if err := cmd.Wait(); err == nil {
|
|
||||||
c.Fatal("did not break writing to a TTY")
|
|
||||||
}
|
|
||||||
|
|
||||||
buf := make([]byte, 1024)
|
buf := make([]byte, 1024)
|
||||||
|
|
||||||
n, err := pty.Read(buf)
|
n, err := pty.Read(buf)
|
||||||
if err != nil {
|
c.Assert(err, check.IsNil) //could not read tty output
|
||||||
c.Fatal("could not read tty output")
|
c.Assert(string(buf[:n]), checker.Contains, "Cowardly refusing", check.Commentf("help output is not being yielded", out))
|
||||||
}
|
|
||||||
|
|
||||||
if !bytes.Contains(buf[:n], []byte("Cowardly refusing")) {
|
|
||||||
c.Fatal("help output is not being yielded", out)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue