mobi/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2025-07-30 18:23:29 +03:00
Code Activity

Merge pull request #21529 from LK4D4/test_exit_early

Browse Source 
integration-cli: exit early if daemon immedately crashed
This commit is contained in:
Vincent Demeester
2016-03-29 09:34:17 +02:00
parent 08db95161a 0f217cead8
commit 6eb3835995
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
integration-cli/docker_cli_daemon_test.go
View File

@ -563,7 +563,7 @@ func (s *DockerDaemonSuite) TestDaemonExitOnFailure(c *check.C) {
//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 {
//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)
}
// look in the log and make sure we got the message that daemon is shutting down