tools/out-of-tree
1
0
Fork 0
Code Releases Activity

Use go timers for kill docker by timeout, fixes #12

Browse Source
This commit is contained in:
dump_stack()
2018-12-08 02:53:29 +00:00
parent 49b567cd4b
commit 880af47cc5
4 changed files with 31 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pew_test.go
View File

@ -13,7 +13,7 @@ import (
"time"
)
func TestDockerCommand(t *testing.T) {
func TestDockerRun(t *testing.T) {
tmp, err := ioutil.TempDir("/tmp/", "out-of-tree_test_")
if err != nil {
t.Fatal(err)
@ -22,8 +22,9 @@ func TestDockerCommand(t *testing.T) {
start := time.Now()
c := dockerCommand("ubuntu", tmp, "1s", "sleep 5s")
_, err = c.CombinedOutput()
timeout := time.Second
_, err = dockerRun(timeout, "ubuntu", tmp, "sleep 5s")
if err == nil {
t.Fatal("docker is not killed by timeout")
}
@ -32,13 +33,12 @@ func TestDockerCommand(t *testing.T) {
time.Since(start), time.Second))
}
c = dockerCommand("ubuntu", tmp, "1m", "echo hello")
rawOutput, err := c.CombinedOutput()
output, err := dockerRun(time.Minute, "ubuntu", tmp, "echo hello")
if err != nil {
t.Fatal(err)
}
if !strings.Contains(string(rawOutput), "hello") {
t.Fatal("wrong output (" + string(rawOutput) + ")")
if !strings.Contains(output, "hello") {
t.Fatal("wrong output (" + output + ")")
}
}