Merge pull request #1009 from size12/testifylint

enabled testifylint

Author: asmyasnikov

.golangci.yml

@@ -244,7 +244,6 @@ linters:
     - scopelint
     - structcheck
     - testableexamples
-    - testifylint
     - testpackage
     - thelper
     - varnamelen

internal/conn/error_test.go

@@ -28,8 +28,8 @@ func TestNodeErrorIs(t *testing.T) {
 	testErr2 := errors.New("test2")
 	nodeErr := newConnError(1, "localhost:1234", testErr)
 
-	require.True(t, errors.Is(nodeErr, testErr))
-	require.False(t, errors.Is(nodeErr, testErr2))
+	require.ErrorIs(t, nodeErr, testErr)
+	require.NotErrorIs(t, nodeErr, testErr2)
 }
 
 type testErrorType1 struct {
@@ -53,7 +53,6 @@ func TestNodeErrorAs(t *testing.T) {
 	nodeErr := newConnError(1, "localhost:1234", testErr)
 
 	target := testErrorType1{}
-	require.True(t, errors.As(nodeErr, &target))
 	require.ErrorAs(t, nodeErr, &target)
 	require.Equal(t, testErr, target)
 

internal/meta/trace_id_test.go

@@ -24,7 +24,7 @@ func TestTraceID(t *testing.T) {
 		require.Equal(t, "00000000-0000-0000-0000-000000000000", id)
 		md, has := metadata.FromOutgoingContext(ctx)
 		require.True(t, has)
-		require.Equal(t, 1, len(md[HeaderTraceID]))
+		require.Len(t, md[HeaderTraceID], 1)
 		require.Equal(t, id, md[HeaderTraceID][0])
 	})
 	t.Run("TraceID from rand failed", func(t *testing.T) {
@@ -51,7 +51,7 @@ func TestTraceID(t *testing.T) {
 		require.Equal(t, "{test}", id)
 		md, has := metadata.FromOutgoingContext(ctx)
 		require.True(t, has)
-		require.Equal(t, 1, len(md[HeaderTraceID]))
+		require.Len(t, md[HeaderTraceID], 1)
 		require.Equal(t, id, md[HeaderTraceID][0])
 	})
 }

internal/table/client_test.go

@@ -947,7 +947,7 @@ func TestDeadlockOnUpdateNodes(t *testing.T) {
 		require.NoError(t, err)
 		s3, err := c.Get(ctx)
 		require.NoError(t, err)
-		require.Equal(t, 3, len(nodes))
+		require.Len(t, nodes, 3)
 		err = c.Put(ctx, s1)
 		require.NoError(t, err)
 		err = c.Put(ctx, s2)
@@ -998,7 +998,7 @@ func TestDeadlockOnInternalPoolGCTick(t *testing.T) {
 			return
 		}
 		require.NoError(t, err)
-		require.Equal(t, 3, len(nodes))
+		require.Len(t, nodes, 3)
 		err = c.Put(ctx, s1)
 		if err != nil && errors.Is(err, context.DeadlineExceeded) {
 			return

internal/table/scanner/result_test.go

@@ -268,7 +268,7 @@ func TestNewStreamWithRecvFirstResultSet(t *testing.T) {
 				}
 				err = result.NextResultSetErr(tt.ctx)
 				require.ErrorIs(t, err, io.EOF)
-				require.True(t, err == io.EOF) //nolint:errorlint
+				require.True(t, err == io.EOF) //nolint:errorlint,testifylint
 				require.Equal(t, 1001, tt.recvCounter)
 				require.Equal(t, 1002, int(result.(*streamResult).nextResultSetCounter.Load()))
 			}

internal/topic/topicreaderinternal/reader_test.go

@@ -6,7 +6,6 @@ import (
 	"runtime"
 	"testing"
 
-	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"go.uber.org/mock/gomock"
 
@@ -168,5 +167,5 @@ func TestReader_WaitInit(t *testing.T) {
 
 	baseReader.EXPECT().WaitInit(gomock.Any())
 	err := reader.WaitInit(context.Background())
-	assert.NoError(t, err)
+	require.NoError(t, err)
 }

internal/topic/topicwriterinternal/writer_reconnector_test.go

@@ -640,7 +640,7 @@ func TestSplitMessagesByBufCodec(t *testing.T) {
 			for _, group := range groups {
 				require.NotEmpty(t, group)
 				require.True(t, allMessagesHasSameBufCodec(group))
-				require.Equal(t, len(group), cap(group))
+				require.Len(t, group, cap(group))
 				for _, mess := range group {
 					expectedNum++
 					require.Equal(t, test[int(expectedNum)], mess.bufCodec)

internal/xerrors/transport_test.go

@@ -191,7 +191,7 @@ func TestTransportErrorName(t *testing.T) {
 	} {
 		t.Run("", func(t *testing.T) {
 			if tt.err == nil {
-				require.Nil(t, TransportError(tt.err))
+				require.Nil(t, TransportError(tt.err)) //nolint:testifylint
 			} else {
 				require.Equal(t, tt.name, TransportError(tt.err).Name())
 			}

internal/xsync/event_broadcast_test.go

@@ -87,6 +87,6 @@ func TestEventBroadcast(t *testing.T) {
 		stopBroadcast.Store(true)
 		<-broadcastStopped
 
-		require.True(t, events.Load() > 0)
+		require.Greater(t, events.Load(), int64(0))
 	})
 }

log/logger_test.go

@@ -10,7 +10,7 @@ import (
 
 func TestColoring(t *testing.T) {
 	zeroClock := clockwork.NewFakeClock()
-	fullDuration := zeroClock.Now().Sub(time.Date(1984, 4, 4, 0, 0, 0, 0, time.Local))
+	fullDuration := zeroClock.Now().Sub(time.Date(1984, 4, 4, 0, 0, 0, 0, time.UTC))
 	zeroClock.Advance(-fullDuration) // set zero time
 	for _, tt := range []struct {
 		l   *defaultLogger