Merge pull request #214 from thaJeztah/19.03_backport_log-daemon-exit-before-tests-finish

[19.03 backport] Ensure all integration daemon logging happens before test exit
This commit is contained in:
Andrew Hsu 2019-05-13 19:13:34 -07:00 committed by GitHub
commit ff44133643
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -271,8 +271,11 @@ func (d *Daemon) StartWithLogFile(out *os.File, providedArgs ...string) error {
wait := make(chan error)
go func() {
wait <- d.cmd.Wait()
ret := d.cmd.Wait()
d.log.Logf("[%s] exiting daemon", d.id)
// If we send before logging, we might accidentally log _after_ the test is done.
// As of Go 1.12, this incurs a panic instead of silently being dropped.
wait <- ret
close(wait)
}()