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

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

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 {