go/opentelemetry-go
go/opentelemetry-go
1
0
Fork 0
mirror of https://github.com/open-telemetry/opentelemetry-go.git synced 2025-04-11 11:21:59 +02:00
Code Issues Releases Activity

[chore]: enable suite-extra-assert-call rule from testifylint (#5833)

Browse Source 
#### Description

Testifylint is a linter that provides best practices with the use of
testify.

This PR enables
[suite-extra-assert-call](https://github.com/Antonboom/testifylint?tab=readme-ov-file#suite-extra-assert-call)
rule from [testifylint](https://github.com/Antonboom/testifylint)

Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>
This commit is contained in:
Matthieu MOREL 2024-09-23 08:56:45 +02:00 committed by GitHub
parent 063239fa37
commit 561bd49e6c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 45 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.golangci.yml
View File

@ -313,4 +313,3 @@ linters-settings:
- go-require - go-require
- negative-positive - negative-positive
- require-error - require-error
- suite-extra-assert-call

22
exporters/zipkin/internal/internaltest/env_test.go
View File

@ -30,7 +30,7 @@ func (s *EnvStoreTestSuite) Test_add() {
envStore.add(e) envStore.add(e)
envStore.add(e) envStore.add(e)
s.Assert().Len(envStore.store, 1) s.Len(envStore.store, 1)
} }
func (s *EnvStoreTestSuite) TestRecord() { func (s *EnvStoreTestSuite) TestRecord() {
@ -87,16 +87,16 @@ func (s *EnvStoreTestSuite) TestRecord() {
for _, tc := range testCases { for _, tc := range testCases {
s.Run(tc.name, func() { s.Run(tc.name, func() {
if tc.env.Exists { if tc.env.Exists {
s.Assert().NoError(os.Setenv(tc.env.Name, tc.env.Value)) s.NoError(os.Setenv(tc.env.Name, tc.env.Value))
} }
envStore := newEnvStore() envStore := newEnvStore()
envStore.Record(tc.env.Name) envStore.Record(tc.env.Name)
s.Assert().Equal(tc.expectedEnvStore, envStore) s.Equal(tc.expectedEnvStore, envStore)
if tc.env.Exists { if tc.env.Exists {
s.Assert().NoError(os.Unsetenv(tc.env.Name)) s.NoError(os.Unsetenv(tc.env.Name))
} }
}) })
} }
@ -140,10 +140,10 @@ func (s *EnvStoreTestSuite) TestRestore() {
s.Require().NoError(os.Unsetenv(tc.env.Name)) s.Require().NoError(os.Unsetenv(tc.env.Name))
s.Assert().NoError(envStore.Restore()) s.NoError(envStore.Restore())
v, exists := os.LookupEnv(tc.env.Name) v, exists := os.LookupEnv(tc.env.Name)
s.Assert().Equal(tc.expectedEnvValue, v) s.Equal(tc.expectedEnvValue, v)
s.Assert().Equal(tc.expectedEnvExists, exists) s.Equal(tc.expectedEnvExists, exists)
// Restore // Restore
s.Require().NoError(backup.Restore()) s.Require().NoError(backup.Restore())
@ -186,11 +186,11 @@ func (s *EnvStoreTestSuite) Test_setEnv() {
s.Require().NoError(os.Setenv(tc.key, "other value")) s.Require().NoError(os.Setenv(tc.key, "other value"))
s.Assert().NoError(envStore.setEnv(tc.key, tc.value)) s.NoError(envStore.setEnv(tc.key, tc.value))
s.Assert().Equal(tc.expectedEnvStore, envStore) s.Equal(tc.expectedEnvStore, envStore)
v, exists := os.LookupEnv(tc.key) v, exists := os.LookupEnv(tc.key)
s.Assert().Equal(tc.expectedEnvValue, v) s.Equal(tc.expectedEnvValue, v)
s.Assert().Equal(tc.expectedEnvExists, exists) s.Equal(tc.expectedEnvExists, exists)
// Restore // Restore
s.Require().NoError(backup.Restore()) s.Require().NoError(backup.Restore())

22
internal/internaltest/env_test.go
View File

@ -30,7 +30,7 @@ func (s *EnvStoreTestSuite) Test_add() {
envStore.add(e) envStore.add(e)
envStore.add(e) envStore.add(e)
s.Assert().Len(envStore.store, 1) s.Len(envStore.store, 1)
} }
func (s *EnvStoreTestSuite) TestRecord() { func (s *EnvStoreTestSuite) TestRecord() {
@ -87,16 +87,16 @@ func (s *EnvStoreTestSuite) TestRecord() {
for _, tc := range testCases { for _, tc := range testCases {
s.Run(tc.name, func() { s.Run(tc.name, func() {
if tc.env.Exists { if tc.env.Exists {
s.Assert().NoError(os.Setenv(tc.env.Name, tc.env.Value)) s.NoError(os.Setenv(tc.env.Name, tc.env.Value))
} }
envStore := newEnvStore() envStore := newEnvStore()
envStore.Record(tc.env.Name) envStore.Record(tc.env.Name)
s.Assert().Equal(tc.expectedEnvStore, envStore) s.Equal(tc.expectedEnvStore, envStore)
if tc.env.Exists { if tc.env.Exists {
s.Assert().NoError(os.Unsetenv(tc.env.Name)) s.NoError(os.Unsetenv(tc.env.Name))
} }
}) })
} }
@ -140,10 +140,10 @@ func (s *EnvStoreTestSuite) TestRestore() {
s.Require().NoError(os.Unsetenv(tc.env.Name)) s.Require().NoError(os.Unsetenv(tc.env.Name))
s.Assert().NoError(envStore.Restore()) s.NoError(envStore.Restore())
v, exists := os.LookupEnv(tc.env.Name) v, exists := os.LookupEnv(tc.env.Name)
s.Assert().Equal(tc.expectedEnvValue, v) s.Equal(tc.expectedEnvValue, v)
s.Assert().Equal(tc.expectedEnvExists, exists) s.Equal(tc.expectedEnvExists, exists)
// Restore // Restore
s.Require().NoError(backup.Restore()) s.Require().NoError(backup.Restore())
@ -186,11 +186,11 @@ func (s *EnvStoreTestSuite) Test_setEnv() {
s.Require().NoError(os.Setenv(tc.key, "other value")) s.Require().NoError(os.Setenv(tc.key, "other value"))
s.Assert().NoError(envStore.setEnv(tc.key, tc.value)) s.NoError(envStore.setEnv(tc.key, tc.value))
s.Assert().Equal(tc.expectedEnvStore, envStore) s.Equal(tc.expectedEnvStore, envStore)
v, exists := os.LookupEnv(tc.key) v, exists := os.LookupEnv(tc.key)
s.Assert().Equal(tc.expectedEnvValue, v) s.Equal(tc.expectedEnvValue, v)
s.Assert().Equal(tc.expectedEnvExists, exists) s.Equal(tc.expectedEnvExists, exists)
// Restore // Restore
s.Require().NoError(backup.Restore()) s.Require().NoError(backup.Restore())

22
internal/shared/internaltest/env_test.go.tmpl
View File

@ -30,7 +30,7 @@ func (s *EnvStoreTestSuite) Test_add() {
envStore.add(e) envStore.add(e)
envStore.add(e) envStore.add(e)
s.Assert().Len(envStore.store, 1) s.Len(envStore.store, 1)
} }
func (s *EnvStoreTestSuite) TestRecord() { func (s *EnvStoreTestSuite) TestRecord() {
@ -87,16 +87,16 @@ func (s *EnvStoreTestSuite) TestRecord() {
for _, tc := range testCases { for _, tc := range testCases {
s.Run(tc.name, func() { s.Run(tc.name, func() {
if tc.env.Exists { if tc.env.Exists {
s.Assert().NoError(os.Setenv(tc.env.Name, tc.env.Value)) s.NoError(os.Setenv(tc.env.Name, tc.env.Value))
} }
envStore := newEnvStore() envStore := newEnvStore()
envStore.Record(tc.env.Name) envStore.Record(tc.env.Name)
s.Assert().Equal(tc.expectedEnvStore, envStore) s.Equal(tc.expectedEnvStore, envStore)
if tc.env.Exists { if tc.env.Exists {
s.Assert().NoError(os.Unsetenv(tc.env.Name)) s.NoError(os.Unsetenv(tc.env.Name))
} }
}) })
} }
@ -140,10 +140,10 @@ func (s *EnvStoreTestSuite) TestRestore() {
s.Require().NoError(os.Unsetenv(tc.env.Name)) s.Require().NoError(os.Unsetenv(tc.env.Name))
s.Assert().NoError(envStore.Restore()) s.NoError(envStore.Restore())
v, exists := os.LookupEnv(tc.env.Name) v, exists := os.LookupEnv(tc.env.Name)
s.Assert().Equal(tc.expectedEnvValue, v) s.Equal(tc.expectedEnvValue, v)
s.Assert().Equal(tc.expectedEnvExists, exists) s.Equal(tc.expectedEnvExists, exists)
// Restore // Restore
s.Require().NoError(backup.Restore()) s.Require().NoError(backup.Restore())
@ -186,11 +186,11 @@ func (s *EnvStoreTestSuite) Test_setEnv() {
s.Require().NoError(os.Setenv(tc.key, "other value")) s.Require().NoError(os.Setenv(tc.key, "other value"))
s.Assert().NoError(envStore.setEnv(tc.key, tc.value)) s.NoError(envStore.setEnv(tc.key, tc.value))
s.Assert().Equal(tc.expectedEnvStore, envStore) s.Equal(tc.expectedEnvStore, envStore)
v, exists := os.LookupEnv(tc.key) v, exists := os.LookupEnv(tc.key)
s.Assert().Equal(tc.expectedEnvValue, v) s.Equal(tc.expectedEnvValue, v)
s.Assert().Equal(tc.expectedEnvExists, exists) s.Equal(tc.expectedEnvExists, exists)
// Restore // Restore
s.Require().NoError(backup.Restore()) s.Require().NoError(backup.Restore())

22
sdk/internal/internaltest/env_test.go
View File

@ -30,7 +30,7 @@ func (s *EnvStoreTestSuite) Test_add() {
envStore.add(e) envStore.add(e)
envStore.add(e) envStore.add(e)
s.Assert().Len(envStore.store, 1) s.Len(envStore.store, 1)
} }
func (s *EnvStoreTestSuite) TestRecord() { func (s *EnvStoreTestSuite) TestRecord() {
@ -87,16 +87,16 @@ func (s *EnvStoreTestSuite) TestRecord() {
for _, tc := range testCases { for _, tc := range testCases {
s.Run(tc.name, func() { s.Run(tc.name, func() {
if tc.env.Exists { if tc.env.Exists {
s.Assert().NoError(os.Setenv(tc.env.Name, tc.env.Value)) s.NoError(os.Setenv(tc.env.Name, tc.env.Value))
} }
envStore := newEnvStore() envStore := newEnvStore()
envStore.Record(tc.env.Name) envStore.Record(tc.env.Name)
s.Assert().Equal(tc.expectedEnvStore, envStore) s.Equal(tc.expectedEnvStore, envStore)
if tc.env.Exists { if tc.env.Exists {
s.Assert().NoError(os.Unsetenv(tc.env.Name)) s.NoError(os.Unsetenv(tc.env.Name))
} }
}) })
} }
@ -140,10 +140,10 @@ func (s *EnvStoreTestSuite) TestRestore() {
s.Require().NoError(os.Unsetenv(tc.env.Name)) s.Require().NoError(os.Unsetenv(tc.env.Name))
s.Assert().NoError(envStore.Restore()) s.NoError(envStore.Restore())
v, exists := os.LookupEnv(tc.env.Name) v, exists := os.LookupEnv(tc.env.Name)
s.Assert().Equal(tc.expectedEnvValue, v) s.Equal(tc.expectedEnvValue, v)
s.Assert().Equal(tc.expectedEnvExists, exists) s.Equal(tc.expectedEnvExists, exists)
// Restore // Restore
s.Require().NoError(backup.Restore()) s.Require().NoError(backup.Restore())
@ -186,11 +186,11 @@ func (s *EnvStoreTestSuite) Test_setEnv() {
s.Require().NoError(os.Setenv(tc.key, "other value")) s.Require().NoError(os.Setenv(tc.key, "other value"))
s.Assert().NoError(envStore.setEnv(tc.key, tc.value)) s.NoError(envStore.setEnv(tc.key, tc.value))
s.Assert().Equal(tc.expectedEnvStore, envStore) s.Equal(tc.expectedEnvStore, envStore)
v, exists := os.LookupEnv(tc.key) v, exists := os.LookupEnv(tc.key)
s.Assert().Equal(tc.expectedEnvValue, v) s.Equal(tc.expectedEnvValue, v)
s.Assert().Equal(tc.expectedEnvExists, exists) s.Equal(tc.expectedEnvExists, exists)
// Restore // Restore
s.Require().NoError(backup.Restore()) s.Require().NoError(backup.Restore())

2
sdk/metric/reader_test.go
View File

@ -198,7 +198,7 @@ func (ts *readerTestSuite) TestShutdownBeforeRegister() {
func (ts *readerTestSuite) TestCollectNilResourceMetricError() { func (ts *readerTestSuite) TestCollectNilResourceMetricError() {
ts.Reader = ts.Factory() ts.Reader = ts.Factory()
ctx := context.Background() ctx := context.Background()
ts.Assert().Error(ts.Reader.Collect(ctx, nil)) ts.Error(ts.Reader.Collect(ctx, nil))
} }
var testScopeMetricsA = metricdata.ScopeMetrics{ var testScopeMetricsA = metricdata.ScopeMetrics{