github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

feat: replace github.com/pkg/errors to errors

Browse Source 
Signed-off-by: haoyun <yun.hao@daocloud.io>
Co-authored-by: zounengren <zouyee1989@gmail.com>
This commit is contained in:
haoyun
2022-01-07 10:19:31 +08:00
parent 3ccd43c8f6
commit bbe46b8c43
299 changed files with 1896 additions and 1874 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
integration/client/daemon_test.go
View File

@@ -18,13 +18,14 @@ package client
import (
"context"
"errors"
"fmt"
"io"
"runtime"
"sync"
"syscall"
. "github.com/containerd/containerd"
"github.com/pkg/errors"
exec "golang.org/x/sys/execabs"
)
@@ -46,7 +47,7 @@ func (d *daemon) start(name, address string, args []string, stdout, stderr io.Wr
cmd.Stderr = stderr
if err := cmd.Start(); err != nil {
cmd.Wait()
return errors.Wrap(err, "failed to start daemon")
return fmt.Errorf("failed to start daemon: %w", err)
}
d.addr = address
d.cmd = cmd
@@ -117,7 +118,7 @@ func (d *daemon) Restart(stopCb func()) error {
}
var err error
if err = d.cmd.Process.Signal(signal); err != nil {
return errors.Wrap(err, "failed to signal daemon")
return fmt.Errorf("failed to signal daemon: %w", err)
}
d.cmd.Wait()
@@ -131,7 +132,7 @@ func (d *daemon) Restart(stopCb func()) error {
cmd.Stderr = d.cmd.Stderr
if err := cmd.Start(); err != nil {
cmd.Wait()
return errors.Wrap(err, "failed to start new daemon instance")
return fmt.Errorf("failed to start new daemon instance: %w", err)
}
d.cmd = cmd