InTheForest/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-01-11 10:41:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

testutil/daemon: Daemon.StopWithError: rename output-var to prevent shadowing

Browse Source 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn
2023-12-28 11:07:15 +01:00
parent 3606712e2d
commit 986988a394
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
testutil/daemon/daemon.go
View File

@@ -699,13 +699,13 @@ func (d *Daemon) Stop(t testing.TB) {
// If it timeouts, a SIGKILL is sent.
// Stop will not delete the daemon directory. If a purged daemon is needed,
// instantiate a new one with NewDaemon.
func (d *Daemon) StopWithError() (err error) {
func (d *Daemon) StopWithError() (retErr error) {
if d.cmd == nil || d.Wait == nil {
return errDaemonNotStarted
}
defer func() {
if err != nil {
d.log.Logf("[%s] error while stopping daemon: %v", d.id, err)
if retErr != nil {
d.log.Logf("[%s] error while stopping daemon: %v", d.id, retErr)
} else {
d.log.Logf("[%s] daemon stopped", d.id)
if d.pidFile != "" {