Skip to content

Commit 39f3295

Browse files
mmlbmmlb
committed
Undisable more golangci-lint linters
1 parent 5eb28d0 commit 39f3295

21 files changed

+112
-101
lines changed

‎.golangci.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ linters:
3737
- cyclop
3838
- depguard
3939
- err113 # todo(*maybe* enable in future PR)
40-
- errname # maybe should be enabled
4140
- exhaustruct
4241
- forbidigo
4342
- funlen
@@ -64,8 +63,6 @@ linters:
6463
- perfsprint
6564
- revive # todo(enable in future PR)
6665
- tagliatelle
67-
- tenv # should be enabled
68-
- testifylint # should be enabled
6966
- testpackage
7067
- thelper # should be enabled
7168
- varnamelen

‎bmc/boot_device_test.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import (
1010
"github.com/google/go-cmp/cmp"
1111
"github.com/hashicorp/go-multierror"
1212
"github.com/stretchr/testify/assert"
13+
"github.com/stretchr/testify/require"
1314
)
1415

1516
type bootDeviceTester struct {
@@ -236,9 +237,9 @@ func TestBootDeviceOverrideGet(t *testing.T) {
236237
override, metadata, err := GetBootDeviceOverrideFromInterface(ctx, 0, testCase.getters)
237238

238239
if testCase.expectedErrorMsg != "" {
239-
assert.ErrorContains(t, err, testCase.expectedErrorMsg)
240+
require.ErrorContains(t, err, testCase.expectedErrorMsg)
240241
} else {
241-
assert.Nil(t, err)
242+
require.NoError(t, err)
242243
}
243244
assert.Equal(t, testCase.expectedOverride, override)
244245
assert.Equal(t, testCase.expectedMetadata, &metadata)

‎bmc/firmware_test.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ func TestFirmwareInstall(t *testing.T) {
6464
}
6565
assert.Equal(t, tc.returnTaskID, taskID)
6666
assert.Equal(t, tc.providerName, metadata.SuccessfulProvider)
67-
assert.Equal(t, tc.providersAttempted, len(metadata.ProvidersAttempted))
67+
assert.Len(t, metadata.ProvidersAttempted, tc.providersAttempted)
6868
})
6969
}
7070
}
@@ -160,7 +160,7 @@ func TestFirmwareInstallStatus(t *testing.T) {
160160
}
161161
assert.Equal(t, tc.returnStatus, taskID)
162162
assert.Equal(t, tc.providerName, metadata.SuccessfulProvider)
163-
assert.Equal(t, tc.providersAttempted, len(metadata.ProvidersAttempted))
163+
assert.Len(t, metadata.ProvidersAttempted, tc.providersAttempted)
164164
})
165165
}
166166
}
@@ -254,7 +254,7 @@ func TestFirmwareInstallUploadAndInitiate(t *testing.T) {
254254
}
255255
assert.Equal(t, tc.returnTaskID, taskID)
256256
assert.Equal(t, tc.providerName, metadata.SuccessfulProvider)
257-
assert.Equal(t, tc.providersAttempted, len(metadata.ProvidersAttempted))
257+
assert.Len(t, metadata.ProvidersAttempted, tc.providersAttempted)
258258
})
259259
}
260260
}
@@ -348,7 +348,7 @@ func TestFirmwareInstallUploaded(t *testing.T) {
348348
}
349349
assert.Equal(t, tc.returnTaskID, taskID)
350350
assert.Equal(t, tc.providerName, metadata.SuccessfulProvider)
351-
assert.Equal(t, tc.providersAttempted, len(metadata.ProvidersAttempted))
351+
assert.Len(t, metadata.ProvidersAttempted, tc.providersAttempted)
352352
})
353353
}
354354
}
@@ -442,7 +442,7 @@ func TestFirmwareUpload(t *testing.T) {
442442
}
443443
assert.Equal(t, tc.returnTaskID, taskID)
444444
assert.Equal(t, tc.providerName, metadata.SuccessfulProvider)
445-
assert.Equal(t, tc.providersAttempted, len(metadata.ProvidersAttempted))
445+
assert.Len(t, metadata.ProvidersAttempted, tc.providersAttempted)
446446
})
447447
}
448448
}
@@ -547,7 +547,7 @@ func TestFirmwareInstallSteps(t *testing.T) {
547547
}
548548
assert.Equal(t, tc.returnSteps, steps)
549549
assert.Equal(t, tc.providerName, metadata.SuccessfulProvider)
550-
assert.Equal(t, tc.providersAttempted, len(metadata.ProvidersAttempted))
550+
assert.Len(t, metadata.ProvidersAttempted, tc.providersAttempted)
551551
})
552552
}
553553
}
@@ -605,7 +605,7 @@ func TestFirmwareTaskStatus(t *testing.T) {
605605
assert.Equal(t, tc.returnState, state)
606606
assert.Equal(t, tc.returnStatus, status)
607607
assert.Equal(t, tc.providerName, metadata.SuccessfulProvider)
608-
assert.Equal(t, tc.providersAttempted, len(metadata.ProvidersAttempted))
608+
assert.Len(t, metadata.ProvidersAttempted, tc.providersAttempted)
609609
})
610610
}
611611
}
@@ -653,7 +653,7 @@ func TestFirmwareTaskStatusFromInterfaces(t *testing.T) {
653653
assert.Equal(t, tc.returnState, state)
654654
assert.Equal(t, tc.returnStatus, status)
655655
assert.Equal(t, tc.providerName, metadata.SuccessfulProvider)
656-
assert.Equal(t, tc.providersAttempted, len(metadata.ProvidersAttempted))
656+
assert.Len(t, metadata.ProvidersAttempted, tc.providersAttempted)
657657
})
658658
}
659659
}

‎bmc/inventory_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ func TestInventory(t *testing.T) {
5656
}
5757
assert.Equal(t, tc.returnDevice, device)
5858
assert.Equal(t, tc.providerName, metadata.SuccessfulProvider)
59-
assert.Equal(t, tc.providersAttempted, len(metadata.ProvidersAttempted))
59+
assert.Len(t, metadata.ProvidersAttempted, tc.providersAttempted)
6060
})
6161
}
6262
}

‎bmc/nmi_test.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import (
77

88
"github.com/pkg/errors"
99
"github.com/stretchr/testify/assert"
10+
"github.com/stretchr/testify/require"
1011
)
1112

1213
type mockNMISender struct {
@@ -113,9 +114,9 @@ func TestSendNMIFromInterface(t *testing.T) {
113114
metadata, err := SendNMIFromInterface(context.Background(), timeout, tt.mockSenders)
114115

115116
if tt.errMsg == "" {
116-
assert.NoError(t, err)
117+
require.NoError(t, err)
117118
} else {
118-
assert.ErrorContains(t, err, tt.errMsg)
119+
require.ErrorContains(t, err, tt.errMsg)
119120
}
120121

121122
assert.Equal(t, tt.expectedMetadata, metadata)

‎bmc/postcode_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ func TestPostCode(t *testing.T) {
5959
assert.Equal(t, tc.returnStatus, status)
6060
assert.Equal(t, tc.returnCode, code)
6161
assert.Equal(t, tc.providerName, metadata.SuccessfulProvider)
62-
assert.Equal(t, tc.providersAttempted, len(metadata.ProvidersAttempted))
62+
assert.Len(t, metadata.ProvidersAttempted, tc.providersAttempted)
6363
})
6464
}
6565
}

‎bmc/sel_test.go‎

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import (
77

88
"github.com/pkg/errors"
99
"github.com/stretchr/testify/assert"
10+
"github.com/stretchr/testify/require"
1011
)
1112

1213
type mockSystemEventLogService struct {
@@ -37,13 +38,13 @@ func TestClearSystemEventLog(t *testing.T) {
3738
// Test with a mock SystemEventLogService that returns nil
3839
mockService := &mockSystemEventLogService{name: "mock1", err: nil}
3940
metadata, err := clearSystemEventLog(ctx, timeout, []systemEventLogProviders{{name: mockService.name, systemEventLogProvider: mockService}})
40-
assert.Nil(t, err)
41-
assert.Equal(t, mockService.name, metadata.SuccessfulProvider)
41+
require.NoError(t, err)
42+
require.Equal(t, mockService.name, metadata.SuccessfulProvider)
4243

4344
// Test with a mock SystemEventLogService that returns an error
4445
mockService = &mockSystemEventLogService{name: "mock2", err: errors.New("mock error")}
4546
metadata, err = clearSystemEventLog(ctx, timeout, []systemEventLogProviders{{name: mockService.name, systemEventLogProvider: mockService}})
46-
assert.NotNil(t, err)
47+
require.Error(t, err)
4748
assert.NotEqual(t, mockService.name, metadata.SuccessfulProvider)
4849
}
4950

@@ -53,18 +54,18 @@ func TestClearSystemEventLogFromInterfaces(t *testing.T) {
5354

5455
// Test with an empty slice
5556
metadata, err := ClearSystemEventLogFromInterfaces(ctx, timeout, []interface{}{})
56-
assert.NotNil(t, err)
57-
assert.Empty(t, metadata.SuccessfulProvider)
57+
require.Error(t, err)
58+
require.Empty(t, metadata.SuccessfulProvider)
5859

5960
// Test with a slice containing a non-SystemEventLog object
6061
metadata, err = ClearSystemEventLogFromInterfaces(ctx, timeout, []interface{}{"not a SystemEventLog Service"})
61-
assert.NotNil(t, err)
62-
assert.Empty(t, metadata.SuccessfulProvider)
62+
require.Error(t, err)
63+
require.Empty(t, metadata.SuccessfulProvider)
6364

6465
// Test with a slice containing a mock SystemEventLogService that returns nil
6566
mockService := &mockSystemEventLogService{name: "mock1"}
6667
metadata, err = ClearSystemEventLogFromInterfaces(ctx, timeout, []interface{}{mockService})
67-
assert.Nil(t, err)
68+
require.NoError(t, err)
6869
assert.Equal(t, mockService.name, metadata.SuccessfulProvider)
6970
}
7071

@@ -75,12 +76,12 @@ func TestGetSystemEventLog(t *testing.T) {
7576
// Test with a mock SystemEventLogService that returns nil
7677
mockService := &mockSystemEventLogService{name: "mock1", err: nil}
7778
_, _, err := getSystemEventLog(ctx, timeout, []systemEventLogProviders{{name: mockService.name, systemEventLogProvider: mockService}})
78-
assert.Nil(t, err)
79+
require.NoError(t, err)
7980

8081
// Test with a mock SystemEventLogService that returns an error
8182
mockService = &mockSystemEventLogService{name: "mock2", err: errors.New("mock error")}
8283
_, _, err = getSystemEventLog(ctx, timeout, []systemEventLogProviders{{name: mockService.name, systemEventLogProvider: mockService}})
83-
assert.NotNil(t, err)
84+
assert.Error(t, err)
8485
}
8586

8687
func TestGetSystemEventLogFromInterfaces(t *testing.T) {
@@ -89,16 +90,16 @@ func TestGetSystemEventLogFromInterfaces(t *testing.T) {
8990

9091
// Test with an empty slice
9192
_, _, err := GetSystemEventLogFromInterfaces(ctx, timeout, []interface{}{})
92-
assert.NotNil(t, err)
93+
require.Error(t, err)
9394

9495
// Test with a slice containing a non-SystemEventLog object
9596
_, _, err = GetSystemEventLogFromInterfaces(ctx, timeout, []interface{}{"not a SystemEventLog Service"})
96-
assert.NotNil(t, err)
97+
require.Error(t, err)
9798

9899
// Test with a slice containing a mock SystemEventLogService that returns nil
99100
mockService := &mockSystemEventLogService{name: "mock1"}
100101
_, _, err = GetSystemEventLogFromInterfaces(ctx, timeout, []interface{}{mockService})
101-
assert.Nil(t, err)
102+
assert.NoError(t, err)
102103
}
103104

104105
func TestGetSystemEventLogRaw(t *testing.T) {
@@ -108,12 +109,12 @@ func TestGetSystemEventLogRaw(t *testing.T) {
108109
// Test with a mock SystemEventLogService that returns nil
109110
mockService := &mockSystemEventLogService{name: "mock1", err: nil}
110111
_, _, err := getSystemEventLogRaw(ctx, timeout, []systemEventLogProviders{{name: mockService.name, systemEventLogProvider: mockService}})
111-
assert.Nil(t, err)
112+
require.NoError(t, err)
112113

113114
// Test with a mock SystemEventLogService that returns an error
114115
mockService = &mockSystemEventLogService{name: "mock2", err: errors.New("mock error")}
115116
_, _, err = getSystemEventLogRaw(ctx, timeout, []systemEventLogProviders{{name: mockService.name, systemEventLogProvider: mockService}})
116-
assert.NotNil(t, err)
117+
assert.Error(t, err)
117118
}
118119

119120
func TestGetSystemEventLogRawFromInterfaces(t *testing.T) {
@@ -122,14 +123,14 @@ func TestGetSystemEventLogRawFromInterfaces(t *testing.T) {
122123

123124
// Test with an empty slice
124125
_, _, err := GetSystemEventLogRawFromInterfaces(ctx, timeout, []interface{}{})
125-
assert.NotNil(t, err)
126+
require.Error(t, err)
126127

127128
// Test with a slice containing a non-SystemEventLog object
128129
_, _, err = GetSystemEventLogRawFromInterfaces(ctx, timeout, []interface{}{"not a SystemEventLog Service"})
129-
assert.NotNil(t, err)
130+
require.Error(t, err)
130131

131132
// Test with a slice containing a mock SystemEventLogService that returns nil
132133
mockService := &mockSystemEventLogService{name: "mock1"}
133134
_, _, err = GetSystemEventLogRawFromInterfaces(ctx, timeout, []interface{}{mockService})
134-
assert.Nil(t, err)
135+
assert.NoError(t, err)
135136
}

‎errors/errors.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -128,14 +128,14 @@ var (
128128
ErrBMCUpdating = errors.New("a BMC firmware update is in progress")
129129
)
130130

131-
type ErrUnsupportedHardware struct {
131+
type UnsupportedHardwareError struct {
132132
msg string
133133
}
134134

135-
func (e *ErrUnsupportedHardware) Error() string {
135+
func (e *UnsupportedHardwareError) Error() string {
136136
return fmt.Sprintf("Hardware not supported: %s", e.msg)
137137
}
138138

139139
func NewErrUnsupportedHardware(s string) error {
140-
return &ErrUnsupportedHardware{s}
140+
return &UnsupportedHardwareError{s}
141141
}

‎internal/redfishwrapper/bios_test.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import (
1212
"testing"
1313

1414
"github.com/stretchr/testify/assert"
15+
"github.com/stretchr/testify/require"
1516
)
1617

1718
func biosConfigFromFixture(t *testing.T) map[string]string {
@@ -87,7 +88,7 @@ func TestGetBiosConfiguration(t *testing.T) {
8788
}
8889

8990
biosConfig, err := client.GetBiosConfiguration(ctx)
90-
assert.Nil(t, err)
91+
require.NoError(t, err)
9192
assert.Equal(t, tc.expectedBiosConfig, biosConfig)
9293
})
9394
}

‎internal/redfishwrapper/firmware_test.go‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import (
1616

1717
bmclibErrs "github.com/bmc-toolbox/bmclib/v2/errors"
1818
"github.com/stretchr/testify/assert"
19+
"github.com/stretchr/testify/require"
1920
"go.uber.org/goleak"
2021
)
2122

@@ -121,7 +122,7 @@ func TestRunRequestWithMultipartPayload(t *testing.T) {
121122
return
122123
}
123124

124-
assert.Nil(t, err)
125+
require.NoError(t, err)
125126
resp.Body.Close()
126127
client.Close(context.Background())
127128
})
@@ -204,8 +205,8 @@ func TestFirmwareInstallMethodURI(t *testing.T) {
204205
return
205206
}
206207

207-
assert.Nil(t, err)
208-
assert.Equal(t, tc.expectInstallMethod, gotMethod)
208+
require.NoError(t, err)
209+
require.Equal(t, tc.expectInstallMethod, gotMethod)
209210
assert.Equal(t, tc.expectUpdateURI, gotURI)
210211

211212
client.Close(context.Background())
@@ -248,7 +249,7 @@ func TestTaskIDFromResponseBody(t *testing.T) {
248249
return
249250
}
250251

251-
assert.Nil(t, err)
252+
require.NoError(t, err)
252253
assert.Equal(t, tc.expectedID, taskID)
253254
})
254255
}
@@ -301,7 +302,7 @@ func TestTaskIDFromLocationHeader(t *testing.T) {
301302
return
302303
}
303304

304-
assert.Nil(t, err)
305+
require.NoError(t, err)
305306
assert.Equal(t, tc.expectedID, taskID)
306307
})
307308
}
@@ -336,10 +337,10 @@ func TestUpdateParametersFormField(t *testing.T) {
336337
return
337338
}
338339

339-
assert.NoError(t, err)
340-
assert.Contains(t, buf.String(), `Content-Disposition: form-data; name="UpdateParameters`)
341-
assert.Contains(t, buf.String(), `Content-Type: application/json`)
342-
assert.NotNil(t, output)
340+
require.NoError(t, err)
341+
require.Contains(t, buf.String(), `Content-Disposition: form-data; name="UpdateParameters`)
342+
require.Contains(t, buf.String(), `Content-Type: application/json`)
343+
require.NotNil(t, output)
343344

344345
// Validate the created multipart form content
345346
err = writer.Close()
@@ -398,7 +399,7 @@ func TestMultipartPayloadSize(t *testing.T) {
398399
assert.Contains(t, err.Error(), tc.errorMsg)
399400
}
400401

401-
assert.Nil(t, err)
402+
require.NoError(t, err)
402403
assert.Equal(t, tc.expectedSize, gotSize)
403404
})
404405
}

0 commit comments

Comments
 (0)