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

4
events/exchange/exchange_test.go
View File

@@ -300,7 +300,7 @@ func TestExchangeValidateTopic(t *testing.T) {
} {
t.Run(testcase.input, func(t *testing.T) {
event := &eventstypes.ContainerCreate{ID: t.Name()}
if err := exchange.Publish(ctx, testcase.input, event); errors.Cause(err) != testcase.err {
if err := exchange.Publish(ctx, testcase.input, event); !errors.Is(err, testcase.err) {
if err == nil {
t.Fatalf("expected error %v, received nil", testcase.err)
} else {
@@ -321,7 +321,7 @@ func TestExchangeValidateTopic(t *testing.T) {
}
// make sure we get same errors with forward.
if err := exchange.Forward(ctx, &envelope); errors.Cause(err) != testcase.err {
if err := exchange.Forward(ctx, &envelope); !errors.Is(err, testcase.err) {
if err == nil {
t.Fatalf("expected error %v, received nil", testcase.err)
} else {