Skip to content

Commit 6052ce0

Browse files
mmorel-35mmorel-35
committed
fix require-error rule from testifylint
Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>
1 parent 02b2078 commit 6052ce0

94 files changed

Lines changed: 444 additions & 410 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.golangci.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,6 @@ linters:
262262
disable:
263263
- float-compare
264264
- go-require
265-
- require-error
266265
enable-all: true
267266

268267
testpackage:

‎internal/hook/hook_tracker_test.go‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import (
2121
"testing"
2222

2323
"github.com/stretchr/testify/assert"
24+
"github.com/stretchr/testify/require"
2425
)
2526

2627
func TestNewHookTracker(t *testing.T) {
@@ -65,13 +66,13 @@ func TestHookTracker_Record(t *testing.T) {
6566
info := tracker.tracker[key]
6667
assert.True(t, info.hookFailed)
6768
assert.True(t, info.hookExecuted)
68-
assert.NoError(t, err)
69+
require.NoError(t, err)
6970

7071
err = tracker.Record("ns2", "pod2", "container1", HookSourceAnnotation, "h1", "", true, fmt.Errorf("err"))
71-
assert.Error(t, err)
72+
require.Error(t, err)
7273

7374
err = tracker.Record("ns1", "pod1", "container1", HookSourceAnnotation, "h1", "", false, nil)
74-
assert.NoError(t, err)
75+
require.NoError(t, err)
7576
assert.True(t, info.hookFailed)
7677
}
7778

@@ -141,10 +142,10 @@ func TestMultiHookTracker_Record(t *testing.T) {
141142
info := mht.trackers["restore1"].tracker[key]
142143
assert.True(t, info.hookFailed)
143144
assert.True(t, info.hookExecuted)
144-
assert.NoError(t, err)
145+
require.NoError(t, err)
145146

146147
err = mht.Record("restore1", "ns2", "pod2", "container1", HookSourceAnnotation, "h1", "", true, fmt.Errorf("err"))
147-
assert.Error(t, err)
148+
require.Error(t, err)
148149

149150
err = mht.Record("restore2", "ns2", "pod2", "container1", HookSourceAnnotation, "h1", "", true, fmt.Errorf("err"))
150151
assert.Error(t, err)

‎internal/hook/item_hook_handler_test.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ func TestHandleHooksSkips(t *testing.T) {
120120

121121
groupResource := schema.ParseGroupResource(test.groupResource)
122122
err := h.HandleHooks(velerotest.NewLogger(), groupResource, test.item, test.hooks, PhasePre, hookTracker)
123-
assert.NoError(t, err)
123+
require.NoError(t, err)
124124
})
125125
}
126126
}
@@ -1199,7 +1199,7 @@ func TestGroupRestoreExecHooks(t *testing.T) {
11991199
for _, tc := range testCases {
12001200
t.Run(tc.name, func(t *testing.T) {
12011201
actual, err := GroupRestoreExecHooks("restore1", tc.resourceRestoreHooks, tc.pod, velerotest.NewLogger(), hookTracker)
1202-
assert.NoError(t, err)
1202+
require.NoError(t, err)
12031203
assert.Equal(t, tc.expected, actual)
12041204
})
12051205
}
@@ -1955,13 +1955,13 @@ func TestHandleRestoreHooks(t *testing.T) {
19551955
t.Run(tc.name, func(t *testing.T) {
19561956
handler := InitContainerRestoreHookHandler{}
19571957
podMap, err := runtime.DefaultUnstructuredConverter.ToUnstructured(&tc.podInput)
1958-
assert.NoError(t, err)
1958+
require.NoError(t, err)
19591959
actual, err := handler.HandleRestoreHooks(velerotest.NewLogger(), kuberesource.Pods, &unstructured.Unstructured{Object: podMap}, tc.restoreHooks, tc.namespaceMapping)
19601960
assert.Equal(t, tc.expectedError, err)
19611961
if actual != nil {
19621962
actualPod := new(corev1api.Pod)
19631963
err = runtime.DefaultUnstructuredConverter.FromUnstructured(actual.UnstructuredContent(), actualPod)
1964-
assert.NoError(t, err)
1964+
require.NoError(t, err)
19651965
assert.Equal(t, tc.expectedPod, actualPod)
19661966
}
19671967
})
@@ -1976,7 +1976,7 @@ func TestValidateContainer(t *testing.T) {
19761976
expectedError := fmt.Errorf("invalid InitContainer in restore hook, it doesn't have Command, Name or Image field")
19771977

19781978
// valid string should return nil as result.
1979-
assert.NoError(t, ValidateContainer([]byte(valid)))
1979+
require.NoError(t, ValidateContainer([]byte(valid)))
19801980

19811981
// noName string should return expected error as result.
19821982
assert.Equal(t, expectedError, ValidateContainer([]byte(noName)))

‎internal/hook/wait_exec_hook_handler_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -732,7 +732,7 @@ func TestWaitExecHandleHooks(t *testing.T) {
732732

733733
for _, e := range test.expectedExecutions {
734734
obj, err := runtime.DefaultUnstructuredConverter.ToUnstructured(e.pod)
735-
assert.NoError(t, err)
735+
require.NoError(t, err)
736736
podCommandExecutor.On("ExecutePodCommand", mock.Anything, obj, e.pod.Namespace, e.pod.Name, e.name, e.hook).Return(e.error)
737737
}
738738

@@ -1264,7 +1264,7 @@ func TestRestoreHookTrackerUpdate(t *testing.T) {
12641264

12651265
for _, e := range test.expectedExecutions {
12661266
obj, err := runtime.DefaultUnstructuredConverter.ToUnstructured(e.pod)
1267-
assert.NoError(t, err)
1267+
require.NoError(t, err)
12681268
podCommandExecutor.On("ExecutePodCommand", mock.Anything, obj, e.pod.Namespace, e.pod.Name, e.name, e.hook).Return(e.error)
12691269
}
12701270

‎internal/resourcemodifiers/json_merge_patch_test.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import (
55

66
"github.com/sirupsen/logrus"
77
"github.com/stretchr/testify/assert"
8+
"github.com/stretchr/testify/require"
89
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
910
"k8s.io/apimachinery/pkg/runtime"
1011
clientgoscheme "k8s.io/client-go/kubernetes/scheme"
@@ -28,7 +29,7 @@ func TestJsonMergePatchFailure(t *testing.T) {
2829
t.Run(tt.name, func(t *testing.T) {
2930
scheme := runtime.NewScheme()
3031
err := clientgoscheme.AddToScheme(scheme)
31-
assert.NoError(t, err)
32+
require.NoError(t, err)
3233
pt := &JSONMergePatcher{
3334
patches: []JSONMergePatch{{PatchData: tt.data}},
3435
}

‎internal/resourcemodifiers/resource_modifiers_test.go‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import (
2121

2222
"github.com/sirupsen/logrus"
2323
"github.com/stretchr/testify/assert"
24+
"github.com/stretchr/testify/require"
2425
corev1api "k8s.io/api/core/v1"
2526
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2627
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
@@ -1303,27 +1304,27 @@ func TestResourceModifiers_ApplyResourceModifierRules_StrategicMergePatch(t *tes
13031304
utilruntime.Must(clientgoscheme.AddToScheme(scheme))
13041305
unstructuredSerializer := yaml.NewDecodingSerializer(unstructured.UnstructuredJSONScheme)
13051306
o1, _, err := unstructuredSerializer.Decode([]byte(podYAMLWithNFSVolume), nil, nil)
1306-
assert.NoError(t, err)
1307+
require.NoError(t, err)
13071308
podWithNFSVolume := o1.(*unstructured.Unstructured)
13081309

13091310
o2, _, err := unstructuredSerializer.Decode([]byte(podYAMLWithPVCVolume), nil, nil)
1310-
assert.NoError(t, err)
1311+
require.NoError(t, err)
13111312
podWithPVCVolume := o2.(*unstructured.Unstructured)
13121313

13131314
o3, _, err := unstructuredSerializer.Decode([]byte(svcYAMLWithPort8000), nil, nil)
1314-
assert.NoError(t, err)
1315+
require.NoError(t, err)
13151316
svcWithPort8000 := o3.(*unstructured.Unstructured)
13161317

13171318
o4, _, err := unstructuredSerializer.Decode([]byte(svcYAMLWithPort9000), nil, nil)
1318-
assert.NoError(t, err)
1319+
require.NoError(t, err)
13191320
svcWithPort9000 := o4.(*unstructured.Unstructured)
13201321

13211322
o5, _, err := unstructuredSerializer.Decode([]byte(podYAMLWithNginxImage), nil, nil)
1322-
assert.NoError(t, err)
1323+
require.NoError(t, err)
13231324
podWithNginxImage := o5.(*unstructured.Unstructured)
13241325

13251326
o6, _, err := unstructuredSerializer.Decode([]byte(podYAMLWithNginx1Image), nil, nil)
1326-
assert.NoError(t, err)
1327+
require.NoError(t, err)
13271328
podWithNginx1Image := o6.(*unstructured.Unstructured)
13281329

13291330
tests := []struct {
@@ -1467,15 +1468,15 @@ func TestResourceModifiers_ApplyResourceModifierRules_StrategicMergePatch(t *tes
14671468
func TestResourceModifiers_ApplyResourceModifierRules_JSONMergePatch(t *testing.T) {
14681469
unstructuredSerializer := yaml.NewDecodingSerializer(unstructured.UnstructuredJSONScheme)
14691470
o1, _, err := unstructuredSerializer.Decode([]byte(cmYAMLWithLabelAToB), nil, nil)
1470-
assert.NoError(t, err)
1471+
require.NoError(t, err)
14711472
cmWithLabelAToB := o1.(*unstructured.Unstructured)
14721473

14731474
o2, _, err := unstructuredSerializer.Decode([]byte(cmYAMLWithLabelAToC), nil, nil)
1474-
assert.NoError(t, err)
1475+
require.NoError(t, err)
14751476
cmWithLabelAToC := o2.(*unstructured.Unstructured)
14761477

14771478
o3, _, err := unstructuredSerializer.Decode([]byte(cmYAMLWithoutLabelA), nil, nil)
1478-
assert.NoError(t, err)
1479+
require.NoError(t, err)
14791480
cmWithoutLabelA := o3.(*unstructured.Unstructured)
14801481

14811482
tests := []struct {
@@ -1618,11 +1619,11 @@ func TestResourceModifiers_ApplyResourceModifierRules_JSONMergePatch(t *testing.
16181619
func TestResourceModifiers_wildcard_in_GroupResource(t *testing.T) {
16191620
unstructuredSerializer := yaml.NewDecodingSerializer(unstructured.UnstructuredJSONScheme)
16201621
o1, _, err := unstructuredSerializer.Decode([]byte(cmYAMLWithLabelAToB), nil, nil)
1621-
assert.NoError(t, err)
1622+
require.NoError(t, err)
16221623
cmWithLabelAToB := o1.(*unstructured.Unstructured)
16231624

16241625
o2, _, err := unstructuredSerializer.Decode([]byte(cmYAMLWithLabelAToC), nil, nil)
1625-
assert.NoError(t, err)
1626+
require.NoError(t, err)
16261627
cmWithLabelAToC := o2.(*unstructured.Unstructured)
16271628

16281629
tests := []struct {
@@ -1694,11 +1695,11 @@ func TestResourceModifiers_wildcard_in_GroupResource(t *testing.T) {
16941695
func TestResourceModifiers_conditional_patches(t *testing.T) {
16951696
unstructuredSerializer := yaml.NewDecodingSerializer(unstructured.UnstructuredJSONScheme)
16961697
o1, _, err := unstructuredSerializer.Decode([]byte(cmYAMLWithLabelAToB), nil, nil)
1697-
assert.NoError(t, err)
1698+
require.NoError(t, err)
16981699
cmWithLabelAToB := o1.(*unstructured.Unstructured)
16991700

17001701
o2, _, err := unstructuredSerializer.Decode([]byte(cmYAMLWithLabelAToC), nil, nil)
1701-
assert.NoError(t, err)
1702+
require.NoError(t, err)
17021703
cmWithLabelAToC := o2.(*unstructured.Unstructured)
17031704

17041705
tests := []struct {

‎internal/resourcemodifiers/strategic_merge_patch_test.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import (
55

66
"github.com/sirupsen/logrus"
77
"github.com/stretchr/testify/assert"
8+
"github.com/stretchr/testify/require"
89
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
910
"k8s.io/apimachinery/pkg/runtime"
1011
"k8s.io/apimachinery/pkg/runtime/schema"
@@ -37,7 +38,7 @@ func TestStrategicMergePatchFailure(t *testing.T) {
3738
t.Run(tt.name, func(t *testing.T) {
3839
scheme := runtime.NewScheme()
3940
err := clientgoscheme.AddToScheme(scheme)
40-
assert.NoError(t, err)
41+
require.NoError(t, err)
4142
pt := &StrategicMergePatcher{
4243
patches: []StrategicMergePatch{{PatchData: tt.data}},
4344
scheme: scheme,

‎internal/resourcepolicies/resource_policies_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import (
1919
"testing"
2020

2121
"github.com/stretchr/testify/assert"
22+
"github.com/stretchr/testify/require"
2223
corev1api "k8s.io/api/core/v1"
2324
"k8s.io/apimachinery/pkg/api/resource"
2425
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -360,7 +361,7 @@ volumePolicies:
360361

361362
// Call the function and check for errors
362363
resPolicies, err := getResourcePoliciesFromConfig(cm)
363-
assert.NoError(t, err)
364+
require.NoError(t, err)
364365

365366
// Check that the returned resourcePolicies object contains the expected data
366367
assert.Equal(t, "v1", resPolicies.version)
@@ -964,10 +965,10 @@ volumePolicies:
964965
if err != nil {
965966
t.Fatalf("got error when get match action %v", err)
966967
}
967-
assert.NoError(t, err)
968+
require.NoError(t, err)
968969
policies := &Policies{}
969970
err = policies.BuildPolicy(resPolicies)
970-
assert.NoError(t, err)
971+
require.NoError(t, err)
971972
vfd := VolumeFilterData{}
972973
if tc.pvc != nil {
973974
vfd.PVC = tc.pvc
@@ -982,7 +983,7 @@ volumePolicies:
982983
}
983984

984985
action, err := policies.GetMatchAction(vfd)
985-
assert.NoError(t, err)
986+
require.NoError(t, err)
986987

987988
if tc.skip {
988989
if action.Type != Skip {
@@ -1022,8 +1023,7 @@ func TestGetMatchAction_Errors(t *testing.T) {
10221023
for _, tc := range testCases {
10231024
t.Run(tc.name, func(t *testing.T) {
10241025
action, err := p.GetMatchAction(tc.input)
1025-
assert.Error(t, err)
1026-
assert.Contains(t, err.Error(), tc.expectedErr)
1026+
require.ErrorContains(t, err, tc.expectedErr)
10271027
assert.Nil(t, action)
10281028
})
10291029
}

‎internal/restartabletest/restartable_delegate.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ func RunRestartableDelegateTests(
115115
expectedErr, expectedErrOk := expected[i].(error)
116116
// If both are errors, use EqualError
117117
if actualErrOk && expectedErrOk {
118-
assert.EqualError(t, actualErr, expectedErr.Error())
118+
require.EqualError(t, actualErr, expectedErr.Error())
119119
continue
120120
}
121121

‎internal/volumehelper/volume_policy_helper_test.go‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -717,7 +717,7 @@ func TestGetVolumeFromResource(t *testing.T) {
717717
},
718718
}
719719
outPV, outPod, err := helper.getVolumeFromResource(pv)
720-
assert.NoError(t, err)
720+
require.NoError(t, err)
721721
assert.NotNil(t, outPV)
722722
assert.Nil(t, outPod)
723723
assert.Equal(t, "test-pv", outPV.Name)
@@ -728,15 +728,14 @@ func TestGetVolumeFromResource(t *testing.T) {
728728
Name: "test-volume",
729729
}
730730
outPV, outPod, err := helper.getVolumeFromResource(vol)
731-
assert.NoError(t, err)
731+
require.NoError(t, err)
732732
assert.Nil(t, outPV)
733733
assert.NotNil(t, outPod)
734734
assert.Equal(t, "test-volume", outPod.Name)
735735
})
736736

737737
t.Run("Invalid input", func(t *testing.T) {
738738
_, _, err := helper.getVolumeFromResource("invalid")
739-
assert.Error(t, err)
740-
assert.Contains(t, err.Error(), "resource is not a PersistentVolume or Volume")
739+
assert.ErrorContains(t, err, "resource is not a PersistentVolume or Volume")
741740
})
742741
}

0 commit comments

Comments
 (0)