From 3024e6223e25011094fa7dd68c1c631c97ccc832 Mon Sep 17 00:00:00 2001 From: Matthieu MOREL Date: Sun, 1 Jun 2025 21:41:25 +0200 Subject: [PATCH] fix equal-values rule from testifylint Signed-off-by: Matthieu MOREL --- .golangci.yaml | 1 - pkg/cmd/util/flag/map_test.go | 2 +- pkg/controller/schedule_controller_test.go | 2 +- pkg/persistence/object_store_test.go | 16 ++++++++-------- pkg/restore/request_test.go | 2 +- pkg/restore/restore_test.go | 2 +- 6 files changed, 12 insertions(+), 13 deletions(-) diff --git a/.golangci.yaml b/.golangci.yaml index 74d3d3e2a..d982fec8d 100644 --- a/.golangci.yaml +++ b/.golangci.yaml @@ -260,7 +260,6 @@ linters: testifylint: # TODO: enable them all disable: - - equal-values # FIXME - float-compare - go-require - require-error diff --git a/pkg/cmd/util/flag/map_test.go b/pkg/cmd/util/flag/map_test.go index 6c1dd3cab..22e25a0e9 100644 --- a/pkg/cmd/util/flag/map_test.go +++ b/pkg/cmd/util/flag/map_test.go @@ -68,7 +68,7 @@ func TestSetOfMap(t *testing.T) { require.Error(t, err) return } - assert.EqualValues(t, c.expected, m.Data()) + assert.Equal(t, c.expected, m.Data()) }) } } diff --git a/pkg/controller/schedule_controller_test.go b/pkg/controller/schedule_controller_test.go index f3e07e7c7..ab0a3f66d 100644 --- a/pkg/controller/schedule_controller_test.go +++ b/pkg/controller/schedule_controller_test.go @@ -193,7 +193,7 @@ func TestReconcileOfSchedule(t *testing.T) { } if len(test.expectedValidationErrors) > 0 { require.NoError(t, err) - assert.EqualValues(t, test.expectedValidationErrors, schedule.Status.ValidationErrors) + assert.Equal(t, test.expectedValidationErrors, schedule.Status.ValidationErrors) } if len(test.expectedLastBackup) > 0 { require.NoError(t, err) diff --git a/pkg/persistence/object_store_test.go b/pkg/persistence/object_store_test.go index fab522c53..3801e5f36 100644 --- a/pkg/persistence/object_store_test.go +++ b/pkg/persistence/object_store_test.go @@ -454,7 +454,7 @@ func TestGetBackupVolumeSnapshots(t *testing.T) { res, err = harness.GetBackupVolumeSnapshots("test-backup") assert.NoError(t, err) - assert.EqualValues(t, snapshots, res) + assert.Equal(t, snapshots, res) } func TestGetBackupItemOperations(t *testing.T) { @@ -504,7 +504,7 @@ func TestGetBackupItemOperations(t *testing.T) { res, err = harness.GetBackupItemOperations("test-backup") assert.NoError(t, err) - assert.EqualValues(t, operations, res) + assert.Equal(t, operations, res) } func TestGetRestoreItemOperations(t *testing.T) { @@ -553,7 +553,7 @@ func TestGetRestoreItemOperations(t *testing.T) { res, err = harness.GetRestoreItemOperations("test-restore") assert.NoError(t, err) - assert.EqualValues(t, operations, res) + assert.Equal(t, operations, res) } func TestGetBackupContents(t *testing.T) { @@ -824,7 +824,7 @@ func TestGetCSIVolumeSnapshotClasses(t *testing.T) { res, err = harness.GetCSIVolumeSnapshotClasses("test-backup") assert.NoError(t, err) - assert.EqualValues(t, classes, res) + assert.Equal(t, classes, res) } func TestGetCSIVolumeSnapshots(t *testing.T) { @@ -860,7 +860,7 @@ func TestGetCSIVolumeSnapshots(t *testing.T) { res, err = harness.GetCSIVolumeSnapshots("test-backup") assert.NoError(t, err) - assert.EqualValues(t, snapshots, res) + assert.Equal(t, snapshots, res) } type objectStoreGetter map[string]velero.ObjectStore @@ -1137,8 +1137,8 @@ func TestGetRestoreResults(t *testing.T) { res, err := harness.GetRestoreResults("test-restore") assert.NoError(t, err) - assert.EqualValues(t, contents["warnings"], res["warnings"]) - assert.EqualValues(t, contents["errors"], res["errors"]) + assert.Equal(t, contents["warnings"], res["warnings"]) + assert.Equal(t, contents["errors"], res["errors"]) } func TestGetRestoredResourceList(t *testing.T) { @@ -1166,7 +1166,7 @@ func TestGetRestoredResourceList(t *testing.T) { res, err := harness.GetRestoredResourceList("test-restore") assert.NoError(t, err) - assert.EqualValues(t, list["pod"], res["pod"]) + assert.Equal(t, list["pod"], res["pod"]) } func TestPutBackupVolumeInfos(t *testing.T) { diff --git a/pkg/restore/request_test.go b/pkg/restore/request_test.go index 5b9d6f71f..70e642837 100644 --- a/pkg/restore/request_test.go +++ b/pkg/restore/request_test.go @@ -63,5 +63,5 @@ func TestRestoredResourceList(t *testing.T) { "v1/Namespace": {"default(created)"}, } - assert.EqualValues(t, expected, request.RestoredResourceList()) + assert.Equal(t, expected, request.RestoredResourceList()) } diff --git a/pkg/restore/restore_test.go b/pkg/restore/restore_test.go index 75dd8f9df..8b499d054 100644 --- a/pkg/restore/restore_test.go +++ b/pkg/restore/restore_test.go @@ -1411,7 +1411,7 @@ func TestRestoreItems(t *testing.T) { assertEmptyResults(t, warnings, errs) assertRestoredItems(t, h, tc.want) if len(tc.expectedRestoreItems) > 0 { - assert.EqualValues(t, tc.expectedRestoreItems, data.RestoredItems) + assert.Equal(t, tc.expectedRestoreItems, data.RestoredItems) } }) }