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

8
sys/mount_linux_test.go
View File

@@ -125,8 +125,8 @@ func testFMountatWithFileFd(t *testing.T, root string) {
defer f.Close()
err = FMountat(f.Fd(), filepath.Join(root, "empty"), filepath.Join(root, "work"), "", 0, "")
if got := errors.Cause(err); got != expectedErr {
t.Fatalf("expected error %v, but got %v", expectedErr, got)
if !errors.Is(err, expectedErr) {
t.Fatalf("expected error %v, but got %v", expectedErr, errors.Cause(err))
}
}
@@ -146,8 +146,8 @@ func testFMountatWithInvalidSource(t *testing.T, root string) {
defer f.Close()
err = FMountat(f.Fd(), filepath.Join(root, "oops"), "at", "bind", unix.MS_BIND, "")
if got := errors.Cause(err); got != expectedErr {
t.Fatalf("expected error %v, but got %v", expectedErr, got)
if !errors.Is(err, expectedErr) {
t.Fatalf("expected error %v, but got %v", expectedErr, err)
}
}