From 8f5b18afafd0b765daf99b1f9349188a0d439d85 Mon Sep 17 00:00:00 2001
From: Pavel Kalinnikov <pavel@cockroachlabs.com>
Date: Fri, 30 Sep 2022 15:18:41 +0100
Subject: [PATCH] kvserver: use assert package in tests

Release note: None
---
 pkg/kv/kvserver/consistency_queue_test.go | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/pkg/kv/kvserver/consistency_queue_test.go b/pkg/kv/kvserver/consistency_queue_test.go
index 35c63dc1cac0..325b94dfa618 100644
--- a/pkg/kv/kvserver/consistency_queue_test.go
+++ b/pkg/kv/kvserver/consistency_queue_test.go
@@ -259,12 +259,10 @@ func TestCheckConsistencyInconsistent(t *testing.T) {
 			// Servers start at 0, but NodeID starts at 1.
 			store, err := tc.Servers[repl.NodeID-1].Stores().GetStore(repl.StoreID)
 			require.NoError(t, err)
-			if s != *store.Ident {
-				t.Errorf("BadChecksumReportDiff called from follower (StoreIdent = %v)", s)
+			if !assert.Equal(t, *store.Ident, s) {
 				return
 			}
-			if len(diff) != 1 {
-				t.Errorf("diff length = %d, diff = %v", len(diff), diff)
+			if !assert.Len(t, diff, 1) {
 				return
 			}
 			d := diff[0]
@@ -284,19 +282,14 @@ func TestCheckConsistencyInconsistent(t *testing.T) {
 +    value:"\x00\x00\x00\x00\x01T"
 +    raw mvcc_key/value: 6500000000000000007b000003db0d 000000000154
 `
-			if act != exp {
-				// We already logged the actual one above.
-				t.Errorf("expected:\n%s\ngot:\n%s", exp, act)
-			}
-
+			assert.Equal(t, exp, act)
 			close(notifyReportDiff)
 		}
 	// s2 (index 1) will panic.
 	notifyFatal := make(chan struct{})
 	testKnobs.ConsistencyTestingKnobs.OnBadChecksumFatal = func(s roachpb.StoreIdent) {
 		store := tc.GetFirstStoreFromServer(t, 1)
-		if s != *store.Ident {
-			t.Errorf("OnBadChecksumFatal called from %v", s)
+		if !assert.Equal(t, *store.Ident, s) {
 			return
 		}
 		close(notifyFatal)