Skip to content

Commit 9a6e105

Browse files
mmorel-35mmorel-35
authored
[chore]: enable compares and negative-positive rules from testifylint (#11128)
#### Description Testifylint is a linter that provides best practices with the use of testify. This PR enables [compares](https://github.com/Antonboom/testifylint?tab=readme-ov-file#compares) and [negative-positive](https://github.com/Antonboom/testifylint?tab=readme-ov-file#negative-positive) rules from [testifylint](https://github.com/Antonboom/testifylint) Signed-off-by: Matthieu MOREL <[email protected]>
1 parent a0fb7fd commit 9a6e105

File tree

9 files changed

+132
-134
lines changed

9 files changed

+132
-134
lines changed

‎.golangci.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,13 +124,11 @@ linters-settings:
124124
testifylint:
125125
# TODO: enable all rules
126126
disable:
127-
- compares
128127
- error-is-as
129128
- expected-actual
130129
- float-compare
131130
- formatter
132131
- go-require
133-
- negative-positive
134132
- require-error
135133
enable-all: true
136134

‎Makefile.Common

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ SEMCONVGEN := $(TOOLS_BIN_DIR)/semconvgen
3838
SEMCONVKIT := $(TOOLS_BIN_DIR)/semconvkit
3939
TESTIFYLINT := $(TOOLS_BIN_DIR)/testifylint
4040

41-
TESTIFYLINT_OPT?= --enable-all --disable=compares,error-is-as,expected-actual,float-compare,formatter,go-require,negative-positive,require-error
41+
TESTIFYLINT_OPT?= --enable-all --disable=error-is-as,expected-actual,float-compare,formatter,go-require,require-error
4242

4343
.PHONY: install-tools
4444
install-tools: $(TOOLS_BIN_NAMES)

‎exporter/exporterhelper/retry_sender_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ func TestQueuedRetry_ThrottleError(t *testing.T) {
188188
ocs.awaitAsyncProcessing()
189189

190190
// The initial backoff is 10ms, but because of the throttle this should wait at least 100ms.
191-
assert.True(t, 100*time.Millisecond < time.Since(start))
191+
assert.Less(t, 100*time.Millisecond, time.Since(start))
192192

193193
mockR.checkNumRequests(t, 2)
194194
ocs.checkSendItemsCount(t, 2)

‎internal/fanoutconsumer/logs_test.go

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -44,18 +44,18 @@ func TestLogsMultiplexingNonMutating(t *testing.T) {
4444
}
4545
}
4646

47-
assert.True(t, ld == p1.AllLogs()[0])
48-
assert.True(t, ld == p1.AllLogs()[1])
47+
assert.Equal(t, ld, p1.AllLogs()[0])
48+
assert.Equal(t, ld, p1.AllLogs()[1])
4949
assert.EqualValues(t, ld, p1.AllLogs()[0])
5050
assert.EqualValues(t, ld, p1.AllLogs()[1])
5151

52-
assert.True(t, ld == p2.AllLogs()[0])
53-
assert.True(t, ld == p2.AllLogs()[1])
52+
assert.Equal(t, ld, p2.AllLogs()[0])
53+
assert.Equal(t, ld, p2.AllLogs()[1])
5454
assert.EqualValues(t, ld, p2.AllLogs()[0])
5555
assert.EqualValues(t, ld, p2.AllLogs()[1])
5656

57-
assert.True(t, ld == p3.AllLogs()[0])
58-
assert.True(t, ld == p3.AllLogs()[1])
57+
assert.Equal(t, ld, p3.AllLogs()[0])
58+
assert.Equal(t, ld, p3.AllLogs()[1])
5959
assert.EqualValues(t, ld, p3.AllLogs()[0])
6060
assert.EqualValues(t, ld, p3.AllLogs()[1])
6161

@@ -80,19 +80,19 @@ func TestLogsMultiplexingMutating(t *testing.T) {
8080
}
8181
}
8282

83-
assert.True(t, ld != p1.AllLogs()[0])
84-
assert.True(t, ld != p1.AllLogs()[1])
83+
assert.NotSame(t, ld, p1.AllLogs()[0])
84+
assert.NotSame(t, ld, p1.AllLogs()[1])
8585
assert.EqualValues(t, ld, p1.AllLogs()[0])
8686
assert.EqualValues(t, ld, p1.AllLogs()[1])
8787

88-
assert.True(t, ld != p2.AllLogs()[0])
89-
assert.True(t, ld != p2.AllLogs()[1])
88+
assert.NotSame(t, ld, p2.AllLogs()[0])
89+
assert.NotSame(t, ld, p2.AllLogs()[1])
9090
assert.EqualValues(t, ld, p2.AllLogs()[0])
9191
assert.EqualValues(t, ld, p2.AllLogs()[1])
9292

9393
// For this consumer, will receive the initial data.
94-
assert.True(t, ld == p3.AllLogs()[0])
95-
assert.True(t, ld == p3.AllLogs()[1])
94+
assert.Equal(t, ld, p3.AllLogs()[0])
95+
assert.Equal(t, ld, p3.AllLogs()[1])
9696
assert.EqualValues(t, ld, p3.AllLogs()[0])
9797
assert.EqualValues(t, ld, p3.AllLogs()[1])
9898

@@ -121,18 +121,18 @@ func TestReadOnlyLogsMultiplexingMutating(t *testing.T) {
121121

122122
// All consumers should receive the cloned data.
123123

124-
assert.True(t, ld != p1.AllLogs()[0])
125-
assert.True(t, ld != p1.AllLogs()[1])
124+
assert.NotEqual(t, ld, p1.AllLogs()[0])
125+
assert.NotEqual(t, ld, p1.AllLogs()[1])
126126
assert.EqualValues(t, ldOrig, p1.AllLogs()[0])
127127
assert.EqualValues(t, ldOrig, p1.AllLogs()[1])
128128

129-
assert.True(t, ld != p2.AllLogs()[0])
130-
assert.True(t, ld != p2.AllLogs()[1])
129+
assert.NotEqual(t, ld, p2.AllLogs()[0])
130+
assert.NotEqual(t, ld, p2.AllLogs()[1])
131131
assert.EqualValues(t, ldOrig, p2.AllLogs()[0])
132132
assert.EqualValues(t, ldOrig, p2.AllLogs()[1])
133133

134-
assert.True(t, ld != p3.AllLogs()[0])
135-
assert.True(t, ld != p3.AllLogs()[1])
134+
assert.NotEqual(t, ld, p3.AllLogs()[0])
135+
assert.NotEqual(t, ld, p3.AllLogs()[1])
136136
assert.EqualValues(t, ldOrig, p3.AllLogs()[0])
137137
assert.EqualValues(t, ldOrig, p3.AllLogs()[1])
138138
}
@@ -154,20 +154,20 @@ func TestLogsMultiplexingMixLastMutating(t *testing.T) {
154154
}
155155
}
156156

157-
assert.True(t, ld != p1.AllLogs()[0])
158-
assert.True(t, ld != p1.AllLogs()[1])
157+
assert.NotSame(t, ld, p1.AllLogs()[0])
158+
assert.NotSame(t, ld, p1.AllLogs()[1])
159159
assert.EqualValues(t, ld, p1.AllLogs()[0])
160160
assert.EqualValues(t, ld, p1.AllLogs()[1])
161161

162162
// For this consumer, will receive the initial data.
163-
assert.True(t, ld == p2.AllLogs()[0])
164-
assert.True(t, ld == p2.AllLogs()[1])
163+
assert.Equal(t, ld, p2.AllLogs()[0])
164+
assert.Equal(t, ld, p2.AllLogs()[1])
165165
assert.EqualValues(t, ld, p2.AllLogs()[0])
166166
assert.EqualValues(t, ld, p2.AllLogs()[1])
167167

168168
// For this consumer, will clone the initial data.
169-
assert.True(t, ld != p3.AllLogs()[0])
170-
assert.True(t, ld != p3.AllLogs()[1])
169+
assert.NotSame(t, ld, p3.AllLogs()[0])
170+
assert.NotSame(t, ld, p3.AllLogs()[1])
171171
assert.EqualValues(t, ld, p3.AllLogs()[0])
172172
assert.EqualValues(t, ld, p3.AllLogs()[1])
173173

@@ -192,19 +192,19 @@ func TestLogsMultiplexingMixLastNonMutating(t *testing.T) {
192192
}
193193
}
194194

195-
assert.True(t, ld != p1.AllLogs()[0])
196-
assert.True(t, ld != p1.AllLogs()[1])
195+
assert.NotSame(t, ld, p1.AllLogs()[0])
196+
assert.NotSame(t, ld, p1.AllLogs()[1])
197197
assert.EqualValues(t, ld, p1.AllLogs()[0])
198198
assert.EqualValues(t, ld, p1.AllLogs()[1])
199199

200-
assert.True(t, ld != p2.AllLogs()[0])
201-
assert.True(t, ld != p2.AllLogs()[1])
200+
assert.NotSame(t, ld, p2.AllLogs()[0])
201+
assert.NotSame(t, ld, p2.AllLogs()[1])
202202
assert.EqualValues(t, ld, p2.AllLogs()[0])
203203
assert.EqualValues(t, ld, p2.AllLogs()[1])
204204

205205
// For this consumer, will receive the initial data.
206-
assert.True(t, ld == p3.AllLogs()[0])
207-
assert.True(t, ld == p3.AllLogs()[1])
206+
assert.Equal(t, ld, p3.AllLogs()[0])
207+
assert.Equal(t, ld, p3.AllLogs()[1])
208208
assert.EqualValues(t, ld, p3.AllLogs()[0])
209209
assert.EqualValues(t, ld, p3.AllLogs()[1])
210210

@@ -224,8 +224,8 @@ func TestLogsWhenErrors(t *testing.T) {
224224
assert.Error(t, lfc.ConsumeLogs(context.Background(), ld))
225225
}
226226

227-
assert.True(t, ld == p3.AllLogs()[0])
228-
assert.True(t, ld == p3.AllLogs()[1])
227+
assert.Equal(t, ld, p3.AllLogs()[0])
228+
assert.Equal(t, ld, p3.AllLogs()[1])
229229
assert.EqualValues(t, ld, p3.AllLogs()[0])
230230
assert.EqualValues(t, ld, p3.AllLogs()[1])
231231
}

‎internal/fanoutconsumer/metrics_test.go

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -44,18 +44,18 @@ func TestMetricsMultiplexingNonMutating(t *testing.T) {
4444
}
4545
}
4646

47-
assert.True(t, md == p1.AllMetrics()[0])
48-
assert.True(t, md == p1.AllMetrics()[1])
47+
assert.Equal(t, md, p1.AllMetrics()[0])
48+
assert.Equal(t, md, p1.AllMetrics()[1])
4949
assert.EqualValues(t, md, p1.AllMetrics()[0])
5050
assert.EqualValues(t, md, p1.AllMetrics()[1])
5151

52-
assert.True(t, md == p2.AllMetrics()[0])
53-
assert.True(t, md == p2.AllMetrics()[1])
52+
assert.Equal(t, md, p2.AllMetrics()[0])
53+
assert.Equal(t, md, p2.AllMetrics()[1])
5454
assert.EqualValues(t, md, p2.AllMetrics()[0])
5555
assert.EqualValues(t, md, p2.AllMetrics()[1])
5656

57-
assert.True(t, md == p3.AllMetrics()[0])
58-
assert.True(t, md == p3.AllMetrics()[1])
57+
assert.Equal(t, md, p3.AllMetrics()[0])
58+
assert.Equal(t, md, p3.AllMetrics()[1])
5959
assert.EqualValues(t, md, p3.AllMetrics()[0])
6060
assert.EqualValues(t, md, p3.AllMetrics()[1])
6161

@@ -80,19 +80,19 @@ func TestMetricsMultiplexingMutating(t *testing.T) {
8080
}
8181
}
8282

83-
assert.True(t, md != p1.AllMetrics()[0])
84-
assert.True(t, md != p1.AllMetrics()[1])
83+
assert.NotSame(t, md, p1.AllMetrics()[0])
84+
assert.NotSame(t, md, p1.AllMetrics()[1])
8585
assert.EqualValues(t, md, p1.AllMetrics()[0])
8686
assert.EqualValues(t, md, p1.AllMetrics()[1])
8787

88-
assert.True(t, md != p2.AllMetrics()[0])
89-
assert.True(t, md != p2.AllMetrics()[1])
88+
assert.NotSame(t, md, p2.AllMetrics()[0])
89+
assert.NotSame(t, md, p2.AllMetrics()[1])
9090
assert.EqualValues(t, md, p2.AllMetrics()[0])
9191
assert.EqualValues(t, md, p2.AllMetrics()[1])
9292

9393
// For this consumer, will receive the initial data.
94-
assert.True(t, md == p3.AllMetrics()[0])
95-
assert.True(t, md == p3.AllMetrics()[1])
94+
assert.Equal(t, md, p3.AllMetrics()[0])
95+
assert.Equal(t, md, p3.AllMetrics()[1])
9696
assert.EqualValues(t, md, p3.AllMetrics()[0])
9797
assert.EqualValues(t, md, p3.AllMetrics()[1])
9898

@@ -121,18 +121,18 @@ func TestReadOnlyMetricsMultiplexingMixFirstMutating(t *testing.T) {
121121

122122
// All consumers should receive the cloned data.
123123

124-
assert.True(t, md != p1.AllMetrics()[0])
125-
assert.True(t, md != p1.AllMetrics()[1])
124+
assert.NotEqual(t, md, p1.AllMetrics()[0])
125+
assert.NotEqual(t, md, p1.AllMetrics()[1])
126126
assert.EqualValues(t, mdOrig, p1.AllMetrics()[0])
127127
assert.EqualValues(t, mdOrig, p1.AllMetrics()[1])
128128

129-
assert.True(t, md != p2.AllMetrics()[0])
130-
assert.True(t, md != p2.AllMetrics()[1])
129+
assert.NotEqual(t, md, p2.AllMetrics()[0])
130+
assert.NotEqual(t, md, p2.AllMetrics()[1])
131131
assert.EqualValues(t, mdOrig, p2.AllMetrics()[0])
132132
assert.EqualValues(t, mdOrig, p2.AllMetrics()[1])
133133

134-
assert.True(t, md != p3.AllMetrics()[0])
135-
assert.True(t, md != p3.AllMetrics()[1])
134+
assert.NotEqual(t, md, p3.AllMetrics()[0])
135+
assert.NotEqual(t, md, p3.AllMetrics()[1])
136136
assert.EqualValues(t, mdOrig, p3.AllMetrics()[0])
137137
assert.EqualValues(t, mdOrig, p3.AllMetrics()[1])
138138
}
@@ -154,20 +154,20 @@ func TestMetricsMultiplexingMixLastMutating(t *testing.T) {
154154
}
155155
}
156156

157-
assert.True(t, md != p1.AllMetrics()[0])
158-
assert.True(t, md != p1.AllMetrics()[1])
157+
assert.NotSame(t, md, p1.AllMetrics()[0])
158+
assert.NotSame(t, md, p1.AllMetrics()[1])
159159
assert.EqualValues(t, md, p1.AllMetrics()[0])
160160
assert.EqualValues(t, md, p1.AllMetrics()[1])
161161

162162
// For this consumer, will receive the initial data.
163-
assert.True(t, md == p2.AllMetrics()[0])
164-
assert.True(t, md == p2.AllMetrics()[1])
163+
assert.Equal(t, md, p2.AllMetrics()[0])
164+
assert.Equal(t, md, p2.AllMetrics()[1])
165165
assert.EqualValues(t, md, p2.AllMetrics()[0])
166166
assert.EqualValues(t, md, p2.AllMetrics()[1])
167167

168168
// For this consumer, will clone the initial data.
169-
assert.True(t, md != p3.AllMetrics()[0])
170-
assert.True(t, md != p3.AllMetrics()[1])
169+
assert.NotSame(t, md, p3.AllMetrics()[0])
170+
assert.NotSame(t, md, p3.AllMetrics()[1])
171171
assert.EqualValues(t, md, p3.AllMetrics()[0])
172172
assert.EqualValues(t, md, p3.AllMetrics()[1])
173173

@@ -192,19 +192,19 @@ func TestMetricsMultiplexingMixLastNonMutating(t *testing.T) {
192192
}
193193
}
194194

195-
assert.True(t, md != p1.AllMetrics()[0])
196-
assert.True(t, md != p1.AllMetrics()[1])
195+
assert.NotSame(t, md, p1.AllMetrics()[0])
196+
assert.NotSame(t, md, p1.AllMetrics()[1])
197197
assert.EqualValues(t, md, p1.AllMetrics()[0])
198198
assert.EqualValues(t, md, p1.AllMetrics()[1])
199199

200-
assert.True(t, md != p2.AllMetrics()[0])
201-
assert.True(t, md != p2.AllMetrics()[1])
200+
assert.NotSame(t, md, p2.AllMetrics()[0])
201+
assert.NotSame(t, md, p2.AllMetrics()[1])
202202
assert.EqualValues(t, md, p2.AllMetrics()[0])
203203
assert.EqualValues(t, md, p2.AllMetrics()[1])
204204

205205
// For this consumer, will receive the initial data.
206-
assert.True(t, md == p3.AllMetrics()[0])
207-
assert.True(t, md == p3.AllMetrics()[1])
206+
assert.Equal(t, md, p3.AllMetrics()[0])
207+
assert.Equal(t, md, p3.AllMetrics()[1])
208208
assert.EqualValues(t, md, p3.AllMetrics()[0])
209209
assert.EqualValues(t, md, p3.AllMetrics()[1])
210210

@@ -224,8 +224,8 @@ func TestMetricsWhenErrors(t *testing.T) {
224224
assert.Error(t, mfc.ConsumeMetrics(context.Background(), md))
225225
}
226226

227-
assert.True(t, md == p3.AllMetrics()[0])
228-
assert.True(t, md == p3.AllMetrics()[1])
227+
assert.Equal(t, md, p3.AllMetrics()[0])
228+
assert.Equal(t, md, p3.AllMetrics()[1])
229229
assert.EqualValues(t, md, p3.AllMetrics()[0])
230230
assert.EqualValues(t, md, p3.AllMetrics()[1])
231231
}

0 commit comments

Comments
 (0)