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

fix #12188 integration-cli: tests using "sleep" can timeout too early - change to "top" instead

Browse Source 
Signed-off-by: Todd Whiteman <todd.whiteman@joyent.com>
Upstream-commit: 42d47c31367d288c7a9ae3acff635e995254469c
Component: engine
This commit is contained in:
Todd Whiteman
2015-04-08 16:32:45 -07:00
parent a951b20a73
commit cb9c496f89
6 changed files with 38 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
components/engine/integration-cli/docker_cli_top_test.go
View File

@ -7,7 +7,7 @@ import (
)
func TestTopMultipleArgs(t *testing.T) {
runCmd := exec.Command(dockerBinary, "run", "-i", "-d", "busybox", "sleep", "20")
runCmd := exec.Command(dockerBinary, "run", "-i", "-d", "busybox", "top")
out, _, err := runCommandWithOutput(runCmd)
if err != nil {
t.Fatalf("failed to start the container: %s, %v", out, err)
@ -30,7 +30,7 @@ func TestTopMultipleArgs(t *testing.T) {
}
func TestTopNonPrivileged(t *testing.T) {
runCmd := exec.Command(dockerBinary, "run", "-i", "-d", "busybox", "sleep", "20")
runCmd := exec.Command(dockerBinary, "run", "-i", "-d", "busybox", "top")
out, _, err := runCommandWithOutput(runCmd)
if err != nil {
t.Fatalf("failed to start the container: %s, %v", out, err)
@ -57,19 +57,19 @@ func TestTopNonPrivileged(t *testing.T) {
deleteContainer(cleanedContainerID)
if !strings.Contains(out1, "sleep 20") && !strings.Contains(out2, "sleep 20") {
t.Fatal("top should've listed `sleep 20` in the process list, but failed twice")
} else if !strings.Contains(out1, "sleep 20") {
t.Fatal("top should've listed `sleep 20` in the process list, but failed the first time")
} else if !strings.Contains(out2, "sleep 20") {
t.Fatal("top should've listed `sleep 20` in the process list, but failed the second itime")
if !strings.Contains(out1, "top") && !strings.Contains(out2, "top") {
t.Fatal("top should've listed `top` in the process list, but failed twice")
} else if !strings.Contains(out1, "top") {
t.Fatal("top should've listed `top` in the process list, but failed the first time")
} else if !strings.Contains(out2, "top") {
t.Fatal("top should've listed `top` in the process list, but failed the second itime")
}
logDone("top - sleep process should be listed in non privileged mode")
logDone("top - top process should be listed in non privileged mode")
}
func TestTopPrivileged(t *testing.T) {
runCmd := exec.Command(dockerBinary, "run", "--privileged", "-i", "-d", "busybox", "sleep", "20")
runCmd := exec.Command(dockerBinary, "run", "--privileged", "-i", "-d", "busybox", "top")
out, _, err := runCommandWithOutput(runCmd)
if err != nil {
t.Fatalf("failed to start the container: %s, %v", out, err)
@ -96,13 +96,13 @@ func TestTopPrivileged(t *testing.T) {
deleteContainer(cleanedContainerID)
if !strings.Contains(out1, "sleep 20") && !strings.Contains(out2, "sleep 20") {
t.Fatal("top should've listed `sleep 20` in the process list, but failed twice")
} else if !strings.Contains(out1, "sleep 20") {
t.Fatal("top should've listed `sleep 20` in the process list, but failed the first time")
} else if !strings.Contains(out2, "sleep 20") {
t.Fatal("top should've listed `sleep 20` in the process list, but failed the second itime")
if !strings.Contains(out1, "top") && !strings.Contains(out2, "top") {
t.Fatal("top should've listed `top` in the process list, but failed twice")
} else if !strings.Contains(out1, "top") {
t.Fatal("top should've listed `top` in the process list, but failed the first time")
} else if !strings.Contains(out2, "top") {
t.Fatal("top should've listed `top` in the process list, but failed the second itime")
}
logDone("top - sleep process should be listed in privileged mode")
logDone("top - top process should be listed in privileged mode")
}