integration-cli: exit early if daemon immedately crashed

this reduces execution of TestInfoDiscoveryInvalidAdvertise from 11s to 0.2s

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 0f217cead8260ab45f9749074d954e5e9e76187b
Component: engine
This commit is contained in:
Alexander Morozov
2016-03-25 14:42:30 -07:00
parent ecee852fa8
commit 7665d0c146
2 changed files with 3 additions and 1 deletions

View File

@ -233,6 +233,8 @@ func (d *Daemon) StartWithLogFile(out *os.File, providedArgs ...string) error {
return fmt.Errorf("[%s] error querying daemon for root directory: %v", d.id, err)
}
return nil
case <-d.wait:
return fmt.Errorf("[%s] Daemon exited during startup", d.id)
}
}
}