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

6
metadata/containers_test.go
View File

@@ -167,7 +167,7 @@ func TestContainersList(t *testing.T) {
// try it again, get NotFound
if err := store.Delete(ctx, id); err == nil {
t.Fatalf("expected error deleting non-existent container")
} else if errors.Cause(err) != errdefs.ErrNotFound {
} else if !errdefs.IsNotFound(err) {
t.Fatalf("unexpected error %v", err)
}
}
@@ -636,7 +636,7 @@ func TestContainersCreateUpdateDelete(t *testing.T) {
now := time.Now().UTC()
result, err := store.Create(ctx, testcase.original)
if errors.Cause(err) != testcase.createerr {
if !errors.Is(err, testcase.createerr) {
if testcase.createerr == nil {
t.Fatalf("unexpected error: %v", err)
} else {
@@ -658,7 +658,7 @@ func TestContainersCreateUpdateDelete(t *testing.T) {
now = time.Now()
result, err = store.Update(ctx, testcase.input, testcase.fieldpaths...)
if errors.Cause(err) != testcase.cause {
if !errors.Is(err, testcase.cause) {
if testcase.cause == nil {
t.Fatalf("unexpected error: %v", err)
} else {

6
metadata/images_test.go
View File

@@ -141,7 +141,7 @@ func TestImagesList(t *testing.T) {
}
// try it again, get NotFound
if err := store.Delete(ctx, id); errors.Cause(err) != errdefs.ErrNotFound {
if err := store.Delete(ctx, id); !errdefs.IsNotFound(err) {
t.Fatalf("unexpected error %v", err)
}
}
@@ -496,7 +496,7 @@ func TestImagesCreateUpdateDelete(t *testing.T) {
// Create
now := time.Now()
created, err := store.Create(ctx, testcase.original)
if errors.Cause(err) != testcase.createerr {
if !errors.Is(err, testcase.createerr) {
if testcase.createerr == nil {
t.Fatalf("unexpected error: %v", err)
} else {
@@ -518,7 +518,7 @@ func TestImagesCreateUpdateDelete(t *testing.T) {
// Update
now = time.Now()
updated, err := store.Update(ctx, testcase.input, testcase.fieldpaths...)
if errors.Cause(err) != testcase.cause {
if !errors.Is(err, testcase.cause) {
if testcase.cause == nil {
t.Fatalf("unexpected error: %v", err)
} else {

6
metadata/leases_test.go
View File

@@ -55,7 +55,7 @@ func TestLeases(t *testing.T) {
if err := db.Update(func(tx *bolt.Tx) error {
lease, err := lm.Create(WithTransactionContext(ctx, tx), leases.WithID(tc.ID))
if err != nil {
if tc.CreateErr != nil && errors.Cause(err) == tc.CreateErr {
if tc.CreateErr != nil && errors.Is(err, tc.CreateErr) {
return nil
}
return err
@@ -88,7 +88,7 @@ func TestLeases(t *testing.T) {
if err := lm.Delete(ctx, leases.Lease{
ID: tc.ID,
}); err != nil {
if tc.DeleteErr == nil && errors.Cause(err) != tc.DeleteErr {
if tc.DeleteErr == nil && !errors.Is(err, tc.DeleteErr) {
t.Fatal(err)
}
@@ -363,7 +363,7 @@ func TestLeaseResource(t *testing.T) {
for i, tc := range testCases {
if err := db.Update(func(tx *bolt.Tx) error {
err0 := lm.AddResource(WithTransactionContext(ctx, tx), tc.lease, tc.resource)
if got := errors.Cause(err0); got != tc.err {
if !errors.Is(err0, tc.err) {
return errors.Errorf("expect error (%v), but got (%v)", tc.err, err0)
}