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

Replace errors.Cause() with errors.Is()

Browse Source 
Dependencies may be switching to use the new `%w` formatting
option to wrap errors; switching to use `errors.Is()` makes
sure that we are still able to unwrap the error and detect the
underlying cause.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn
2020-05-08 01:03:26 +02:00
parent 834f58bd0c
commit dc92ad6520
25 changed files with 51 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lease_test.go
View File

@@ -24,7 +24,6 @@ import (
"github.com/containerd/containerd/images"
"github.com/containerd/containerd/leases"
"github.com/opencontainers/image-spec/identity"
"github.com/pkg/errors"
)
func TestLeaseResources(t *testing.T) {
@@ -108,7 +107,7 @@ func TestLeaseResources(t *testing.T) {
}
// config should be removed but the snapshotter should exist
if _, err := cs.Info(ctx, cfgDesc.Digest); errors.Cause(err) != errdefs.ErrNotFound {
if _, err := cs.Info(ctx, cfgDesc.Digest); !errdefs.IsNotFound(err) {
t.Fatalf("expected error(%v), but got(%v)", errdefs.ErrNotFound, err)
}
@@ -135,7 +134,7 @@ func TestLeaseResources(t *testing.T) {
t.Fatal(err)
}
if _, err := sn.Stat(ctx, chainID.String()); errors.Cause(err) != errdefs.ErrNotFound {
if _, err := sn.Stat(ctx, chainID.String()); !errdefs.IsNotFound(err) {
t.Fatalf("expected error(%v), but got(%v)", errdefs.ErrNotFound, err)
}
}