treewide: replace error comparisons and assertions with errors.Is
Change-Id: Id2424eb155f2c6842c72c5fafd124d428ef901f2
Reviewed-on: https://review.monogon.dev/c/monogon/+/2994
Tested-by: Jenkins CI
Reviewed-by: Serge Bazanski <serge@monogon.tech>
diff --git a/metropolis/pkg/event/etcd/etcd_test.go b/metropolis/pkg/event/etcd/etcd_test.go
index 6173732..d4eb04f 100644
--- a/metropolis/pkg/event/etcd/etcd_test.go
+++ b/metropolis/pkg/event/etcd/etcd_test.go
@@ -131,7 +131,7 @@
if err == nil {
return
}
- if err == ctxT.Err() {
+ if errors.Is(err, ctxT.Err()) {
log.Printf("Retrying after %v", err)
continue
}
@@ -776,7 +776,7 @@
// As expected, next call to Get with BacklogOnly fails - there truly is no new
// updates to emit.
_, err = watcher.Get(ctx, event.BacklogOnly[StringAt]())
- if want, got := event.BacklogDone, err; want != got {
+ if want, got := event.BacklogDone, err; !errors.Is(got, want) {
t.Fatalf("Second Get: wanted %v, got %v", want, got)
}
@@ -784,7 +784,7 @@
// BacklogOnly will still return BacklogDone.
tc.put(t, k, "second")
_, err = watcher.Get(ctx, event.BacklogOnly[StringAt]())
- if want, got := event.BacklogDone, err; want != got {
+ if want, got := event.BacklogDone, err; !errors.Is(got, want) {
t.Fatalf("Third Get: wanted %v, got %v", want, got)
}
@@ -840,7 +840,7 @@
nUpdates := 1
for {
g, err := w.Get(ctx, event.BacklogOnly[StringAt]())
- if err == event.BacklogDone {
+ if errors.Is(err, event.BacklogDone) {
break
}
if err != nil {
diff --git a/metropolis/pkg/event/memory/memory_test.go b/metropolis/pkg/event/memory/memory_test.go
index 98a1501..80ac575 100644
--- a/metropolis/pkg/event/memory/memory_test.go
+++ b/metropolis/pkg/event/memory/memory_test.go
@@ -18,6 +18,7 @@
import (
"context"
+ "errors"
"fmt"
"sync"
"sync/atomic"
@@ -294,7 +295,7 @@
// Cancel the context, and expect that context error to propagate to the .Get().
ctxC()
- if want, got := ctx.Err(), <-errs; want != got {
+ if want, got := ctx.Err(), <-errs; !errors.Is(got, want) {
t.Fatalf("Get should've returned %v, got %v", want, got)
}
@@ -308,7 +309,7 @@
// Unblock the .Get now.
p.Set(1)
- if want, got := error(nil), <-errs; want != got {
+ if want, got := error(nil), <-errs; !errors.Is(got, want) {
t.Fatalf("Get should've returned %v, got %v", want, got)
}
}