diff --git a/.golangci.yml b/.golangci.yml index debc27d26..79b64ebe4 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -244,7 +244,6 @@ linters: - scopelint - structcheck - testableexamples - - testifylint - testpackage - thelper - varnamelen diff --git a/internal/conn/error_test.go b/internal/conn/error_test.go index 971e09da4..cd9e68b71 100644 --- a/internal/conn/error_test.go +++ b/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) diff --git a/internal/meta/trace_id_test.go b/internal/meta/trace_id_test.go index fe6e04340..09c71a034 100644 --- a/internal/meta/trace_id_test.go +++ b/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]) }) } diff --git a/internal/table/client_test.go b/internal/table/client_test.go index 0ab4a0b61..90937d41c 100644 --- a/internal/table/client_test.go +++ b/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 diff --git a/internal/table/scanner/result_test.go b/internal/table/scanner/result_test.go index 756dd0d44..e7eb25e36 100644 --- a/internal/table/scanner/result_test.go +++ b/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())) } diff --git a/internal/topic/topicreaderinternal/reader_test.go b/internal/topic/topicreaderinternal/reader_test.go index 18679e758..56f7e1de9 100644 --- a/internal/topic/topicreaderinternal/reader_test.go +++ b/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) } diff --git a/internal/topic/topicwriterinternal/writer_reconnector_test.go b/internal/topic/topicwriterinternal/writer_reconnector_test.go index dbfeedec2..618e61706 100644 --- a/internal/topic/topicwriterinternal/writer_reconnector_test.go +++ b/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) diff --git a/internal/xerrors/transport_test.go b/internal/xerrors/transport_test.go index df0645ec4..d94aa8ee4 100644 --- a/internal/xerrors/transport_test.go +++ b/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()) } diff --git a/internal/xsync/event_broadcast_test.go b/internal/xsync/event_broadcast_test.go index 3980ef7c6..c52d57bf7 100644 --- a/internal/xsync/event_broadcast_test.go +++ b/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)) }) } diff --git a/log/logger_test.go b/log/logger_test.go index 946743c28..f7b12a71c 100644 --- a/log/logger_test.go +++ b/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 diff --git a/table/options/models_test.go b/table/options/models_test.go index 40b24a99e..6682f308d 100644 --- a/table/options/models_test.go +++ b/table/options/models_test.go @@ -68,7 +68,7 @@ func TestTimeToLiveSettingsFluentModifiers(t *testing.T) { }, } { t.Run("", func(t *testing.T) { - require.Equal(t, tt.fluentSettings, tt.expectedSettings) + require.Equal(t, tt.expectedSettings, tt.fluentSettings) }) } } diff --git a/table/options/options_test.go b/table/options/options_test.go index 010de4c6b..d702a8fb0 100644 --- a/table/options/options_test.go +++ b/table/options/options_test.go @@ -76,8 +76,8 @@ func TestSessionOptionsProfile(t *testing.T) { } else { require.Equal( t, - p.PartitionAtKeys.SplitPoints, []*Ydb.TypedValue{value.ToYDB(types.Int64Value(1), a)}, + p.PartitionAtKeys.SplitPoints, ) } }