From 7dcf943afcdd7a6b85e2fe22c1fe088554b1642b Mon Sep 17 00:00:00 2001 From: Tibor Vass Date: Wed, 3 Sep 2014 15:56:58 -0700 Subject: [PATCH] fix race in daemon test framework Signed-off-by: Tibor Vass Upstream-commit: defe01daf87237e42a9275a0b286b0f71c60de25 Component: engine --- components/engine/integration-cli/docker_utils.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/components/engine/integration-cli/docker_utils.go b/components/engine/integration-cli/docker_utils.go index 6133f3727b..a123ca2dc4 100644 --- a/components/engine/integration-cli/docker_utils.go +++ b/components/engine/integration-cli/docker_utils.go @@ -90,14 +90,16 @@ func (d *Daemon) Start(arg ...string) error { return fmt.Errorf("Could not start daemon container: %v", err) } - d.wait = make(chan error) + wait := make(chan error) go func() { - d.wait <- d.cmd.Wait() + wait <- d.cmd.Wait() d.t.Log("exiting daemon") - close(d.wait) + close(wait) }() + d.wait = wait + tick := time.Tick(500 * time.Millisecond) // make sure daemon is ready to receive requests for {