clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-09-07 06:22:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use inspectField to simplify code

Browse Source 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
This commit is contained in:
Qiang Huang
2015-05-18 10:06:13 +08:00
parent 9c5635a2a0
commit 74f8a4eca4
9 changed files with 84 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files
integration-cli/docker_cli_wait_test.go
+4 -12
View File
@@ -21,12 +21,8 @@ func (s *DockerSuite) TestWaitNonBlockedExitZero(c *check.C) {
status := "true"
for i := 0; status != "false"; i++ {
runCmd = exec.Command(dockerBinary, "inspect", "--format='{{.State.Running}}'", containerID)
status, _, err = runCommandWithOutput(runCmd)
if err != nil {
c.Fatal(status, err)
}
status = strings.TrimSpace(status)
status, err = inspectField(containerID, "State.Running")
c.Assert(err, check.IsNil)
time.Sleep(time.Second)
if i >= 60 {
@@ -84,12 +80,8 @@ func (s *DockerSuite) TestWaitNonBlockedExitRandom(c *check.C) {
status := "true"
for i := 0; status != "false"; i++ {
runCmd = exec.Command(dockerBinary, "inspect", "--format='{{.State.Running}}'", containerID)
status, _, err = runCommandWithOutput(runCmd)
if err != nil {
c.Fatal(status, err)
}
status = strings.TrimSpace(status)
status, err = inspectField(containerID, "State.Running")
c.Assert(err, check.IsNil)
time.Sleep(time.Second)
if i >= 60 {