0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #37543 from Snorch/do_not_lose_error_message

Browse source 
Don not lose an error message from d.StartWithError in d.Start
This commit is contained in:
Sebastiaan van Stijn 2018-07-30 13:20:01 +02:00 • committed by GitHub
commit 73d73ba962
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
internal/test/daemon/daemon.go
View file

@ -200,7 +200,7 @@ func (d *Daemon) Start(t testingT, args ...string) {
ht.Helper()
}
if err := d.StartWithError(args...); err != nil {
t.Fatalf("Error starting daemon with arguments: %v", args)
t.Fatalf("Error starting daemon with arguments %v : %v", args, err)
}
}
@ -324,8 +324,8 @@ func (d *Daemon) StartWithLogFile(out *os.File, providedArgs ...string) error {
return errors.Errorf("[%s] error querying daemon for root directory: %v", d.id, err)
}
return nil
case <-d.Wait:
return errors.Errorf("[%s] Daemon exited during startup", d.id)
case err := <-d.Wait:
return errors.Errorf("[%s] Daemon exited during startup: %v", d.id, err)
}
}
}