toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

remove some uneeded sleeps in tests

Browse Source 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 9e0ffae864d6679084e84e2e27cbb9d350f6dbae
Component: engine
This commit is contained in:
Brian Goff
2015-04-21 21:51:41 -04:00
parent 4b91c36f40
commit bb3c396980
2 changed files with 71 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
components/engine/integration-cli/docker_cli_wait_test.go
View File

@ -44,19 +44,29 @@ func (s *DockerSuite) TestWaitNonBlockedExitZero(c *check.C) {
// blocking wait with 0 exit code
func (s *DockerSuite) TestWaitBlockedExitZero(c *check.C) {
runCmd := exec.Command(dockerBinary, "run", "-d", "busybox", "sh", "-c", "sleep 10")
out, _, err := runCommandWithOutput(runCmd)
if err != nil {
c.Fatal(out, err)
}
out, _ := dockerCmd(c, "run", "-d", "busybox", "/bin/sh", "-c", "trap 'exit 0' SIGTERM; while true; do sleep 0.01; done")
containerID := strings.TrimSpace(out)
runCmd = exec.Command(dockerBinary, "wait", containerID)
out, _, err = runCommandWithOutput(runCmd)
if err := waitRun(containerID); err != nil {
c.Fatal(err)
}
if err != nil || strings.TrimSpace(out) != "0" {
c.Fatal("failed to set up container", out, err)
chWait := make(chan string)
go func() {
out, _, _ := runCommandWithOutput(exec.Command(dockerBinary, "wait", containerID))
chWait <- out
}()
time.Sleep(100 * time.Millisecond)
dockerCmd(c, "stop", containerID)
select {
case status := <-chWait:
if strings.TrimSpace(status) != "0" {
c.Fatalf("expected exit 0, got %s", status)
}
case <-time.After(2 * time.Second):
c.Fatal("timeout waiting for `docker wait` to exit")
}
}
@ -97,19 +107,30 @@ func (s *DockerSuite) TestWaitNonBlockedExitRandom(c *check.C) {
// blocking wait with random exit code
func (s *DockerSuite) TestWaitBlockedExitRandom(c *check.C) {
runCmd := exec.Command(dockerBinary, "run", "-d", "busybox", "sh", "-c", "sleep 10; exit 99")
out, _, err := runCommandWithOutput(runCmd)
if err != nil {
c.Fatal(out, err)
}
out, _ := dockerCmd(c, "run", "-d", "busybox", "sh", "-c", "trap 'exit 99' SIGTERM; while true; do sleep 0.01; done")
containerID := strings.TrimSpace(out)
runCmd = exec.Command(dockerBinary, "wait", containerID)
out, _, err = runCommandWithOutput(runCmd)
if err != nil || strings.TrimSpace(out) != "99" {
c.Fatal("failed to set up container", out, err)
if err := waitRun(containerID); err != nil {
c.Fatal(err)
}
if err := waitRun(containerID); err != nil {
c.Fatal(err)
}
chWait := make(chan string)
go func() {
out, _, _ := runCommandWithOutput(exec.Command(dockerBinary, "wait", containerID))
chWait <- out
}()
time.Sleep(100 * time.Millisecond)
dockerCmd(c, "stop", containerID)
select {
case status := <-chWait:
if strings.TrimSpace(status) != "99" {
c.Fatalf("expected exit 99, got %s", status)
}
case <-time.After(2 * time.Second):
c.Fatal("timeout waiting for `docker wait` to exit")
}
}