Fix and silence some linter issues

grafana · Apr 12, 2021 · 69d1150 · 69d1150
1 parent d5f62d7
commit 69d1150
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 7 deletions.
diff --git a/js/runner_test.go b/js/runner_test.go
@@ -2062,6 +2062,7 @@ func TestExecutionStats(t *testing.T) {
 	for _, tc := range testCases {
 		tc := tc
 		t.Run(tc.name, func(t *testing.T) {
+			t.Parallel()
 			r, err := getSimpleRunner(t, "/script.js", tc.script)
 			if tc.expErr != "" {
 				require.Error(t, err)

diff --git a/lib/execution_segment_test.go b/lib/execution_segment_test.go
@@ -926,8 +926,10 @@ func BenchmarkExecutionSegmentScale(b *testing.B) {
 // TODO: test with randomized things
 
 func TestSegmentedIndex(t *testing.T) {
+	t.Parallel()
 	// TODO ... more structure ?
 	t.Run("full", func(t *testing.T) {
+		t.Parallel()
 		s := SegmentedIndex{start: 0, lcd: 1, offsets: []int64{1}}
 
 		s.Next()
@@ -964,6 +966,7 @@ func TestSegmentedIndex(t *testing.T) {
 	})
 
 	t.Run("half", func(t *testing.T) {
+		t.Parallel()
 		s := SegmentedIndex{start: 0, lcd: 2, offsets: []int64{2}}
 
 		s.Next()
@@ -1004,6 +1007,7 @@ func TestSegmentedIndex(t *testing.T) {
 	})
 
 	t.Run("the other half", func(t *testing.T) {
+		t.Parallel()
 		s := SegmentedIndex{start: 1, lcd: 2, offsets: []int64{2}}
 
 		s.Next()
@@ -1044,6 +1048,7 @@ func TestSegmentedIndex(t *testing.T) {
 	})
 
 	t.Run("strange", func(t *testing.T) {
+		t.Parallel()
 		s := SegmentedIndex{start: 1, lcd: 7, offsets: []int64{4, 3}}
 
 		s.Next()

diff --git a/lib/executor/common_test.go b/lib/executor/common_test.go
@@ -55,7 +55,7 @@ func setupExecutor(t *testing.T, config lib.ExecutorConfig, es *lib.ExecutionSta
 	logEntry := logrus.NewEntry(testLog)
 
 	initVUFunc := func(_ context.Context, logger *logrus.Entry) (lib.InitializedVU, error) {
-		return runner.NewVU(es.GetUniqueVUIdentifier(), engineOut)
+		return runner.NewVU(es.GetUniqueVUIdentifier(), engineOut) //nolint: wrapcheck
 	}
 	es.SetInitVUFunc(initVUFunc)
 

diff --git a/lib/executor/constant_arrival_rate_test.go b/lib/executor/constant_arrival_rate_test.go
@@ -357,9 +357,10 @@ func TestConstantArrivalRateGlobalIters(t *testing.T) {
 		{"0,1/4,3/4,1", "3/4:1", []uint64{0, 4, 9, 14}},
 	}
 
-	for _, tc := range testCases {
+	for _, tc := range testCases { //nolint: paralleltest // false positive: https://github.com/kunwardeep/paralleltest/issues/8
 		tc := tc
 		t.Run(fmt.Sprintf("%s_%s", tc.seq, tc.seg), func(t *testing.T) {
+			t.Parallel()
 			ess, err := lib.NewExecutionSegmentSequenceFromString(tc.seq)
 			require.NoError(t, err)
 			seg, err := lib.NewExecutionSegmentFromString(tc.seg)

diff --git a/lib/executor/ramping_arrival_rate.go b/lib/executor/ramping_arrival_rate.go
@@ -193,7 +193,7 @@ func (varr *RampingArrivalRate) Init(ctx context.Context) error {
 	start, offsets, lcd := et.GetStripedOffsets()
 	varr.segIdx = lib.NewSegmentedIndex(start, lcd, offsets)
 
-	return err
+	return err //nolint: wrapcheck
 }
 
 // incrGlobalIter increments the global iteration count for this executor,

diff --git a/lib/executor/ramping_arrival_rate_test.go b/lib/executor/ramping_arrival_rate_test.go
@@ -185,7 +185,7 @@ func TestRampingArrivalRateRunUnplannedVUs(t *testing.T) {
 		time.Sleep(time.Millisecond * 200)
 		cur = atomic.LoadInt64(&count)
 		require.NotEqual(t, cur, int64(2))
-		return runner.NewVU(es.GetUniqueVUIdentifier(), engineOut)
+		return runner.NewVU(es.GetUniqueVUIdentifier(), engineOut) //nolint: wrapcheck
 	})
 	err = executor.Run(ctx, engineOut)
 	assert.NoError(t, err)
@@ -235,7 +235,7 @@ func TestRampingArrivalRateRunCorrectRateWithSlowRate(t *testing.T) {
 		cur = atomic.LoadInt64(&count)
 		require.NotEqual(t, cur, int64(1))
 
-		return runner.NewVU(es.GetUniqueVUIdentifier(), engineOut)
+		return runner.NewVU(es.GetUniqueVUIdentifier(), engineOut) //nolint: wrapcheck
 	})
 	err = executor.Run(ctx, engineOut)
 	assert.NoError(t, err)
@@ -611,9 +611,10 @@ func TestRampingArrivalRateGlobalIters(t *testing.T) {
 		{"0,1/4,3/4,1", "3/4:1", []uint64{0, 4, 9}},
 	}
 
-	for _, tc := range testCases {
+	for _, tc := range testCases { //nolint: paralleltest // false positive: https://github.com/kunwardeep/paralleltest/issues/8
 		tc := tc
 		t.Run(fmt.Sprintf("%s_%s", tc.seq, tc.seg), func(t *testing.T) {
+			t.Parallel()
 			ess, err := lib.NewExecutionSegmentSequenceFromString(tc.seq)
 			require.NoError(t, err)
 			seg, err := lib.NewExecutionSegmentFromString(tc.seg)

diff --git a/lib/executor/shared_iterations_test.go b/lib/executor/shared_iterations_test.go
@@ -162,9 +162,10 @@ func TestSharedIterationsGlobalIters(t *testing.T) {
 		{"0,1/4,3/4,1", "3/4:1", []uint64{0, 4, 9, 14, 19, 24, 29, 34, 39, 44}},
 	}
 
-	for _, tc := range testCases {
+	for _, tc := range testCases { //nolint: paralleltest // false positive: https://github.com/kunwardeep/paralleltest/issues/8
 		tc := tc
 		t.Run(fmt.Sprintf("%s_%s", tc.seq, tc.seg), func(t *testing.T) {
+			t.Parallel()
 			ess, err := lib.NewExecutionSegmentSequenceFromString(tc.seq)
 			require.NoError(t, err)
 			seg, err := lib.NewExecutionSegmentFromString(tc.seg)