Commit 9dea2247 authored by Matthew Sykes's avatar Matthew Sykes
Browse files

[FAB-13086] longer wait for term in healh check



Also cleanup the dangling network and test directory.

Change-Id: I145e4d97ed5bb0c7513c71ad8e0b7d6525f01128
Signed-off-by: default avatarMatthew Sykes <sykesmat@us.ibm.com>
parent 5ab30b8d
......@@ -83,7 +83,7 @@ var _ = Describe("EndToEndACL", func() {
AfterEach(func() {
process.Signal(syscall.SIGTERM)
Eventually(process.Wait()).Should(Receive())
Eventually(process.Wait(), network.EventuallyTimeout).Should(Receive())
network.Cleanup()
os.RemoveAll(testDir)
})
......
......@@ -11,6 +11,7 @@ import (
"fmt"
"io/ioutil"
"net/http"
"os"
"syscall"
docker "github.com/fsouza/go-dockerclient"
......@@ -45,9 +46,13 @@ var _ = Describe("Health", func() {
AfterEach(func() {
if process != nil {
process.Signal(syscall.SIGKILL)
Eventually(process.Wait).Should(Receive())
process.Signal(syscall.SIGTERM)
Eventually(process.Wait, network.EventuallyTimeout).Should(Receive())
}
if network != nil {
network.Cleanup()
}
os.RemoveAll(testDir)
})
Context("when the docker config is bad", func() {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment