Merge branch 'fix_require_equal' into 'master'

Stop using require.Error to compare error values

See merge request gitlab-org/gitaly!2896

5 files changed, 8 insertions, 6 deletions

diff --git a/internal/gitaly/service/smarthttp/receive_pack_test.go b/internal/gitaly/service/smarthttp/receive_pack_test.go
index d50d2b967..36acf19f7 100644
--- a/internal/gitaly/service/smarthttp/receive_pack_test.go
+++ b/internal/gitaly/service/smarthttp/receive_pack_test.go
@@ -430,7 +430,7 @@ func TestPostReceivePackToHooks(t *testing.T) {
 
 	expectedResponse := "0049\x01000eunpack ok\n0019ok refs/heads/master\n0019ok refs/heads/branch\n00000000"
 	require.Equal(t, expectedResponse, string(response), "Expected response to be %q, got %q", expectedResponse, response)
-	require.Error(t, drainPostReceivePackResponse(stream), io.EOF)
+	require.Equal(t, io.EOF, drainPostReceivePackResponse(stream))
 }
 
 func runSmartHTTPHookServiceServer(t *testing.T) (*grpc.Server, string) {
diff --git a/internal/praefect/datastore/memory_test.go b/internal/praefect/datastore/memory_test.go
index e707fed08..a7defa0be 100644
--- a/internal/praefect/datastore/memory_test.go
+++ b/internal/praefect/datastore/memory_test.go
@@ -128,7 +128,7 @@ func TestMemoryReplicationEventQueue(t *testing.T) {
 	require.Equal(t, expAttempt3, dequeuedAttempt3[0])
 
 	ackFailedNoAttemptsLeft, err := queue.Acknowledge(ctx, JobStateFailed, []uint64{event1.ID})
-	require.Error(t, errDeadAckedAsFailed, err)
+	require.Equal(t, errDeadAckedAsFailed, err)
 	require.Empty(t, ackFailedNoAttemptsLeft)
 
 	acknowledgedAttempt3, err := queue.Acknowledge(ctx, JobStateDead, []uint64{event1.ID})
diff --git a/internal/praefect/grpc-proxy/proxy/peeker_test.go b/internal/praefect/grpc-proxy/proxy/peeker_test.go
index 38565da00..19a1f8760 100644
--- a/internal/praefect/grpc-proxy/proxy/peeker_test.go
+++ b/internal/praefect/grpc-proxy/proxy/peeker_test.go
@@ -73,7 +73,7 @@ func TestStreamPeeking(t *testing.T) {
 	require.True(t, proto.Equal(resp, pingResp), "expected to be the same")
 
 	_, err = proxyClientPingStream.Recv()
-	require.Error(t, io.EOF, err)
+	require.Equal(t, io.EOF, err)
 }
 
 func TestStreamInjecting(t *testing.T) {
@@ -136,5 +136,5 @@ func TestStreamInjecting(t *testing.T) {
 	require.True(t, proto.Equal(resp, pingResp), "expected to be the same")
 
 	_, err = proxyClientPingStream.Recv()
-	require.Error(t, io.EOF, err)
+	require.Equal(t, io.EOF, err)
 }
diff --git a/internal/praefect/helper_test.go b/internal/praefect/helper_test.go
index d3c78620f..869d7766b 100644
--- a/internal/praefect/helper_test.go
+++ b/internal/praefect/helper_test.go
@@ -262,7 +262,7 @@ func runPraefectServer(t testing.TB, conf config.Config, opt buildOptions) (*grp
 		prf.Stop()
 
 		cancel()
-		require.Error(t, context.Canceled, <-errQ)
+		require.NoError(t, <-errQ)
 	}
 
 	return cc, prf, cleanup
diff --git a/internal/praefect/nodes/sql_elector_test.go b/internal/praefect/nodes/sql_elector_test.go
index 83e45f717..a836596c3 100644
--- a/internal/praefect/nodes/sql_elector_test.go
+++ b/internal/praefect/nodes/sql_elector_test.go
@@ -201,13 +201,15 @@ func TestBasicFailover(t *testing.T) {
 
 	// Bring second node down
 	healthSrv0.SetServingStatus("", grpc_health_v1.HealthCheckResponse_UNKNOWN)
+	predateElection(t, ctx, db, shardName, failoverTimeout)
+	predateLastSeenActiveAt(t, db, shardName, cs0.GetStorage(), failoverTimeout)
 
 	err = elector.checkNodes(ctx)
 	require.NoError(t, err)
 	db.RequireRowsInTable(t, "node_status", 2)
 	// No new candidates
 	_, err = elector.GetShard(ctx)
-	require.Error(t, ErrPrimaryNotHealthy, err)
+	require.Equal(t, ErrPrimaryNotHealthy, err)
 }
 
 func TestElectDemotedPrimary(t *testing.T) {