Skip to content

Commit d284a86

Browse files
mmorel-35pellared
andauthored
[chore]: enable error-nil rule from testifylint (#5843)
Testifylint is a linter that provides best practices with the use of testify. This PR enables [error-nil](https://github.com/Antonboom/testifylint?tab=readme-ov-file#error-nil) rule from [testifylint](https://github.com/Antonboom/testifylint) Signed-off-by: Matthieu MOREL <[email protected]> Co-authored-by: Robert Pająk <[email protected]>
1 parent 316114c commit d284a86

File tree

13 files changed

+8
-14
lines changed

13 files changed

+8
-14
lines changed

.golangci.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,6 @@ linters-settings:
306306
testifylint:
307307
enable-all: true
308308
disable:
309-
- error-nil
310309
- expected-actual
311310
- float-compare
312311
- go-require

bridge/opencensus/metric_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ func TestMetricProducer(t *testing.T) {
131131
if tc.expectErr {
132132
require.Error(t, err)
133133
} else {
134-
require.Nil(t, err)
134+
require.NoError(t, err)
135135
}
136136
require.Equal(t, len(output), len(tc.expected))
137137
for i := range output {

exporters/otlp/otlpmetric/otlpmetricgrpc/internal/partialsuccess_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import (
1515

1616
func requireErrorString(t *testing.T, expect string, err error) {
1717
t.Helper()
18-
require.NotNil(t, err)
1918
require.Error(t, err)
2019
require.ErrorIs(t, err, PartialSuccess{})
2120

exporters/otlp/otlpmetric/otlpmetricgrpc/internal/transform/error_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ func TestMultiErr(t *testing.T) {
3535
me := &multiErr{datatype: name}
3636

3737
t.Run("ErrOrNil", func(t *testing.T) {
38-
require.Nil(t, me.errOrNil())
38+
require.NoError(t, me.errOrNil())
3939
me.errs = []error{e0}
4040
assert.Error(t, me.errOrNil())
4141
})

exporters/otlp/otlpmetric/otlpmetrichttp/internal/partialsuccess_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import (
1515

1616
func requireErrorString(t *testing.T, expect string, err error) {
1717
t.Helper()
18-
require.NotNil(t, err)
1918
require.Error(t, err)
2019
require.ErrorIs(t, err, PartialSuccess{})
2120

exporters/otlp/otlpmetric/otlpmetrichttp/internal/transform/error_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ func TestMultiErr(t *testing.T) {
3535
me := &multiErr{datatype: name}
3636

3737
t.Run("ErrOrNil", func(t *testing.T) {
38-
require.Nil(t, me.errOrNil())
38+
require.NoError(t, me.errOrNil())
3939
me.errs = []error{e0}
4040
assert.Error(t, me.errOrNil())
4141
})

exporters/otlp/otlptrace/otlptracegrpc/internal/partialsuccess_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import (
1515

1616
func requireErrorString(t *testing.T, expect string, err error) {
1717
t.Helper()
18-
require.NotNil(t, err)
1918
require.Error(t, err)
2019
require.ErrorIs(t, err, PartialSuccess{})
2120

exporters/otlp/otlptrace/otlptracehttp/internal/partialsuccess_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import (
1515

1616
func requireErrorString(t *testing.T, expect string, err error) {
1717
t.Helper()
18-
require.NotNil(t, err)
1918
require.Error(t, err)
2019
require.ErrorIs(t, err, PartialSuccess{})
2120

exporters/stdout/stdouttrace/trace_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ func TestExporterExportSpan(t *testing.T) {
8888
// write to buffer for testing
8989
var b bytes.Buffer
9090
ex, err := stdouttrace.New(append(tt.opts, stdouttrace.WithWriter(&b))...)
91-
require.Nil(t, err)
91+
require.NoError(t, err)
9292

9393
err = ex.ExportSpans(tt.ctx, tracetest.SpanStubs{ss, ss}.Snapshots())
9494
assert.Equal(t, tt.wantErr, err)

internal/shared/otlp/otlpmetric/transform/error_test.go.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ func TestMultiErr(t *testing.T) {
3535
me := &multiErr{datatype: name}
3636

3737
t.Run("ErrOrNil", func(t *testing.T) {
38-
require.Nil(t, me.errOrNil())
38+
require.NoError(t, me.errOrNil())
3939
me.errs = []error{e0}
4040
assert.Error(t, me.errOrNil())
4141
})

0 commit comments

Comments
 (0)