Merge pull request #1010 from size12/testifylint

enabled wastedassign
ydb-platform · Jan 24, 2024 · 693fdbb · 693fdbb
2 parents 96e641b + a9ce335
commit 693fdbb
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 11 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -247,7 +247,6 @@ linters:
     - testpackage
     - thelper
     - varnamelen
-    - wastedassign
     - wrapcheck
     - wsl
 

diff --git a/internal/background/worker_test.go b/internal/background/worker_test.go
@@ -106,8 +106,6 @@ func TestWorkerConcurrentStartAndClose(t *testing.T) {
 		ctx := xtest.Context(t)
 		w := NewWorker(ctx)
 
-		closeIndex := int64(0)
-
 		stopNewStarts := xatomic.Bool{}
 		var wgStarters sync.WaitGroup
 		for i := 0; i < parallel; i++ {
@@ -134,11 +132,12 @@ func TestWorkerConcurrentStartAndClose(t *testing.T) {
 
 		require.NoError(t, w.Close(xtest.ContextWithCommonTimeout(ctx, t), nil))
 
-		closeIndex = counter.Load()
-		require.Equal(t, closeIndex, counter.Load())
-
 		stopNewStarts.Store(true)
 		xtest.WaitGroup(t, &wgStarters)
+
+		_, ok := <-w.tasks
+		require.False(t, ok)
+		require.True(t, w.closed)
 	})
 }
 

diff --git a/internal/table/scanner/perfomance_test.go b/internal/table/scanner/perfomance_test.go
@@ -123,7 +123,7 @@ func BenchmarkTestSliceIncrement(b *testing.B) {
 	for j := 0; j < testSize; j++ {
 		slice[j] = &column{}
 	}
-	cnt := 0
+	var cnt int
 	var row column
 	b.ResetTimer()
 	for i := 0; i < b.N; i++ {

diff --git a/internal/topic/retriable_error.go b/internal/topic/retriable_error.go
@@ -65,8 +65,6 @@ func CheckRetryMode(err error, settings RetrySettings, retriesDuration time.Dura
 		return nil, false
 	}
 
-	isRetriable = true
-
 	mode := retry.Check(err)
 
 	decision := PublicRetryDecisionDefault

diff --git a/internal/topic/topicwriterinternal/writer_reconnector.go b/internal/topic/topicwriterinternal/writer_reconnector.go
@@ -351,7 +351,7 @@ func (w *WriterReconnector) connectionLoop(ctx context.Context) {
 		return xcontext.WithCancel(xcontext.WithoutDeadline(ctx))
 	}
 
-	//nolint:ineffassign,staticcheck
+	//nolint:ineffassign,staticcheck,wastedassign
 	streamCtx, streamCtxCancel := createStreamContext()
 
 	defer streamCtxCancel()

diff --git a/table/options/models.go b/table/options/models.go
@@ -198,7 +198,8 @@ func (rr ReadReplicasSettings) ToYDB() *Ydb_Table.ReadReplicasSettings {
 }
 
 func NewReadReplicasSettings(rr *Ydb_Table.ReadReplicasSettings) ReadReplicasSettings {
-	t, c := ReadReplicasPerAzReadReplicas, uint64(0)
+	t := ReadReplicasPerAzReadReplicas
+	var c uint64
 
 	if c = rr.GetPerAzReadReplicasCount(); c != 0 {
 		t = ReadReplicasPerAzReadReplicas