starred/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-09-27 01:40:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

Assert error in body of function inspectField*

Browse Source 
1. Replace raw `docker inspect -f xxx` with `inspectField`, to make code
cleaner and more consistent
2. assert the error in function `inspectField*` so we don't need to
assert the return value of it every time, this will make inspect easier.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: 62a856e9129c9d5cf7db9ea6322c9073d68e3ea4
Component: engine
This commit is contained in:
Zhang Wei
2016-01-29 23:39:07 +08:00
parent 86311e0101
commit 8bc92ae008
34 changed files with 298 additions and 591 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/engine/integration-cli/docker_cli_exec_test.go
+4 -7
View File
@@ -288,23 +288,21 @@ func (s *DockerSuite) TestInspectExecID(c *check.C) {
out, _ := dockerCmd(c, "run", "-d", "busybox", "top")
id := strings.TrimSuffix(out, "\n")
out, err := inspectField(id, "ExecIDs")
c.Assert(err, checker.IsNil, check.Commentf("failed to inspect container: %s", out))
out = inspectField(c, id, "ExecIDs")
c.Assert(out, checker.Equals, "[]", check.Commentf("ExecIDs should be empty, got: %s", out))
// Start an exec, have it block waiting so we can do some checking
cmd := exec.Command(dockerBinary, "exec", id, "sh", "-c",
"while ! test -e /tmp/execid1; do sleep 1; done")
err = cmd.Start()
err := cmd.Start()
c.Assert(err, checker.IsNil, check.Commentf("failed to start the exec cmd"))
// Give the exec 10 chances/seconds to start then give up and stop the test
tries := 10
for i := 0; i < tries; i++ {
// Since its still running we should see exec as part of the container
out, err = inspectField(id, "ExecIDs")
c.Assert(err, checker.IsNil, check.Commentf("failed to inspect container: %s", out))
out = inspectField(c, id, "ExecIDs")
out = strings.TrimSuffix(out, "\n")
if out != "[]" && out != "<no value>" {
@@ -328,8 +326,7 @@ func (s *DockerSuite) TestInspectExecID(c *check.C) {
cmd.Wait()
// All execs for the container should be gone now
out, err = inspectField(id, "ExecIDs")
c.Assert(err, checker.IsNil, check.Commentf("failed to inspect container: %s", out))
out = inspectField(c, id, "ExecIDs")
out = strings.TrimSuffix(out, "\n")
c.Assert(out == "[]" || out == "<no value>", checker.True)