Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[chore]: enable error-nil rule from testifylint #5843

Merged
merged 2 commits into from
Sep 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,6 @@ linters-settings:
testifylint:
enable-all: true
disable:
- error-nil
- expected-actual
- float-compare
- go-require
Expand Down
2 changes: 1 addition & 1 deletion bridge/opencensus/metric_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ func TestMetricProducer(t *testing.T) {
if tc.expectErr {
require.Error(t, err)
} else {
require.Nil(t, err)
require.NoError(t, err)
}
require.Equal(t, len(output), len(tc.expected))
for i := range output {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import (

func requireErrorString(t *testing.T, expect string, err error) {
t.Helper()
require.NotNil(t, err)
require.Error(t, err)
require.ErrorIs(t, err, PartialSuccess{})

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ func TestMultiErr(t *testing.T) {
me := &multiErr{datatype: name}

t.Run("ErrOrNil", func(t *testing.T) {
require.Nil(t, me.errOrNil())
require.NoError(t, me.errOrNil())
me.errs = []error{e0}
assert.Error(t, me.errOrNil())
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import (

func requireErrorString(t *testing.T, expect string, err error) {
t.Helper()
require.NotNil(t, err)
require.Error(t, err)
require.ErrorIs(t, err, PartialSuccess{})

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ func TestMultiErr(t *testing.T) {
me := &multiErr{datatype: name}

t.Run("ErrOrNil", func(t *testing.T) {
require.Nil(t, me.errOrNil())
require.NoError(t, me.errOrNil())
me.errs = []error{e0}
assert.Error(t, me.errOrNil())
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import (

func requireErrorString(t *testing.T, expect string, err error) {
t.Helper()
require.NotNil(t, err)
require.Error(t, err)
require.ErrorIs(t, err, PartialSuccess{})

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import (

func requireErrorString(t *testing.T, expect string, err error) {
t.Helper()
require.NotNil(t, err)
require.Error(t, err)
require.ErrorIs(t, err, PartialSuccess{})

Expand Down
2 changes: 1 addition & 1 deletion exporters/stdout/stdouttrace/trace_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ func TestExporterExportSpan(t *testing.T) {
// write to buffer for testing
var b bytes.Buffer
ex, err := stdouttrace.New(append(tt.opts, stdouttrace.WithWriter(&b))...)
require.Nil(t, err)
require.NoError(t, err)

err = ex.ExportSpans(tt.ctx, tracetest.SpanStubs{ss, ss}.Snapshots())
assert.Equal(t, tt.wantErr, err)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ func TestMultiErr(t *testing.T) {
me := &multiErr{datatype: name}

t.Run("ErrOrNil", func(t *testing.T) {
require.Nil(t, me.errOrNil())
require.NoError(t, me.errOrNil())
me.errs = []error{e0}
assert.Error(t, me.errOrNil())
})
Expand Down
1 change: 0 additions & 1 deletion internal/shared/otlp/partialsuccess_test.go.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import (

func requireErrorString(t *testing.T, expect string, err error) {
t.Helper()
require.NotNil(t, err)
require.Error(t, err)
require.ErrorIs(t, err, PartialSuccess{})

Expand Down
4 changes: 2 additions & 2 deletions sdk/metric/config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ func TestConfigReaderSignalsEmpty(t *testing.T) {
require.NotNil(t, s)

ctx := context.Background()
assert.Nil(t, f(ctx))
assert.Nil(t, s(ctx))
assert.NoError(t, f(ctx))
assert.NoError(t, s(ctx))
assert.ErrorIs(t, s(ctx), ErrReaderShutdown)
}

Expand Down
2 changes: 1 addition & 1 deletion sdk/trace/provider_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,7 @@ func testStoredError(t *testing.T, target interface{}) {
err := handler.errs[0]

require.Implements(t, (*error)(nil), target)
require.NotNil(t, target.(error))
require.Error(t, target.(error))

defer handler.Reset()
if errors.Is(err, target.(error)) {
Expand Down
Loading