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>
This commit is contained in:
parent
0524a9783d
commit
0f217cead8
|
@ -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 fmt.Errorf("[%s] error querying daemon for root directory: %v", d.id, err)
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
|
case <-d.wait:
|
||||||
|
return fmt.Errorf("[%s] Daemon exited during startup", d.id)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -563,7 +563,7 @@ func (s *DockerDaemonSuite) TestDaemonExitOnFailure(c *check.C) {
|
||||||
//attempt to start daemon with incorrect flags (we know -b and --bip conflict)
|
//attempt to start daemon with incorrect flags (we know -b and --bip conflict)
|
||||||
if err := s.d.Start("--bridge", "nosuchbridge", "--bip", "1.1.1.1"); err != nil {
|
if err := s.d.Start("--bridge", "nosuchbridge", "--bip", "1.1.1.1"); err != nil {
|
||||||
//verify we got the right error
|
//verify we got the right error
|
||||||
if !strings.Contains(err.Error(), "Daemon exited and never started") {
|
if !strings.Contains(err.Error(), "Daemon exited") {
|
||||||
c.Fatalf("Expected daemon not to start, got %v", err)
|
c.Fatalf("Expected daemon not to start, got %v", err)
|
||||||
}
|
}
|
||||||
// look in the log and make sure we got the message that daemon is shutting down
|
// look in the log and make sure we got the message that daemon is shutting down
|
||||||
|
|
Loading…
Reference in New Issue