From 26d26d0cecd39f72fd896eb0af102e3ad5fa61ac Mon Sep 17 00:00:00 2001 From: redwrasse Date: Tue, 24 Sep 2024 16:59:08 -0700 Subject: [PATCH] tests: additional remaining errors.Is Signed-off-by: redwrasse --- tests/integration/clientv3/maintenance_test.go | 2 +- tests/integration/clientv3/watch_test.go | 3 ++- tests/integration/v3_grpc_test.go | 2 +- tests/integration/v3_lease_test.go | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/tests/integration/clientv3/maintenance_test.go b/tests/integration/clientv3/maintenance_test.go index 3de3d389c..f6702d3f7 100644 --- a/tests/integration/clientv3/maintenance_test.go +++ b/tests/integration/clientv3/maintenance_test.go @@ -304,7 +304,7 @@ func testMaintenanceSnapshotErrorInflight(t *testing.T, snapshot func(context.Co close(donec) }() _, err = io.Copy(io.Discard, rc1) - if err != nil && err != context.Canceled { + if err != nil && !errors.Is(err, context.Canceled) { t.Errorf("expected %v, got %v", context.Canceled, err) } <-donec diff --git a/tests/integration/clientv3/watch_test.go b/tests/integration/clientv3/watch_test.go index bc76c8187..aecfb6c68 100644 --- a/tests/integration/clientv3/watch_test.go +++ b/tests/integration/clientv3/watch_test.go @@ -16,6 +16,7 @@ package clientv3test import ( "context" + "errors" "fmt" "math/rand" "reflect" @@ -809,7 +810,7 @@ func TestWatchAfterClose(t *testing.T) { donec := make(chan struct{}) go func() { cli.Watch(context.TODO(), "foo") - if err := cli.Close(); err != nil && err != context.Canceled { + if err := cli.Close(); err != nil && !errors.Is(err, context.Canceled) { t.Errorf("expected %v, got %v", context.Canceled, err) } close(donec) diff --git a/tests/integration/v3_grpc_test.go b/tests/integration/v3_grpc_test.go index 8efeb5d52..5a0bdacd8 100644 --- a/tests/integration/v3_grpc_test.go +++ b/tests/integration/v3_grpc_test.go @@ -1562,7 +1562,7 @@ func TestTLSGRPCRejectInsecureClient(t *testing.T) { // nil out TLS field so client will use an insecure connection clus.Members[0].ClientTLSInfo = nil client, err := integration.NewClientV3(clus.Members[0]) - if err != nil && err != context.DeadlineExceeded { + if err != nil && !errors.Is(err, context.DeadlineExceeded) { t.Fatalf("unexpected error (%v)", err) } else if client == nil { // Ideally, no client would be returned. However, grpc will diff --git a/tests/integration/v3_lease_test.go b/tests/integration/v3_lease_test.go index d9d9a7423..c1288de0c 100644 --- a/tests/integration/v3_lease_test.go +++ b/tests/integration/v3_lease_test.go @@ -1086,7 +1086,7 @@ func testV3LeaseTimeToLiveWithLeaderChanged(t *testing.T, fpName string) { require.NoError(t, gofail.Enable(fpName, `sleep("3s")`)) t.Cleanup(func() { terr := gofail.Disable(fpName) - if terr != nil && terr != gofail.ErrDisabled { + if terr != nil && !errors.Is(terr, gofail.ErrDisabled) { t.Fatalf("failed to disable %s: %v", fpName, terr) } })