fix race in daemon test framework

Signed-off-by: Tibor Vass <teabee89@gmail.com>
Upstream-commit: defe01daf87237e42a9275a0b286b0f71c60de25
Component: engine
This commit is contained in:
Tibor Vass
2014-09-03 15:56:58 -07:00
parent 713ee31e08
commit 7dcf943afc

View File

@ -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 {