mirrors/velero
1
0
Fork 0
mirror of https://github.com/vmware-tanzu/velero.git synced 2026-09-07 08:37:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix require-error rule from testifylint

Browse Source 
Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>
This commit is contained in:
Matthieu MOREL
2025-06-23 15:39:54 +00:00
parent 3024e6223e
commit 07ea14962c
99 changed files with 483 additions and 440 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/plugin/clientmgmt/backupitemaction/v1/restartable_backup_item_action_test.go
+2 -2
View File
@@ -88,7 +88,7 @@ func TestRestartableBackupItemActionGetDelegate(t *testing.T) {
r := NewRestartableBackupItemAction(name, p)
a, err := r.getDelegate()
assert.Nil(t, a)
assert.EqualError(t, err, "reset error")
require.EqualError(t, err, "reset error")
// Happy path
p.On("ResetIfNeeded").Return(nil)
@@ -97,7 +97,7 @@ func TestRestartableBackupItemActionGetDelegate(t *testing.T) {
p.On("GetByKindAndName", key).Return(expected, nil)
a, err = r.getDelegate()
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, expected, a)
}
pkg/plugin/clientmgmt/backupitemaction/v2/restartable_backup_item_action_test.go
+2 -2
View File
@@ -88,7 +88,7 @@ func TestRestartableBackupItemActionGetDelegate(t *testing.T) {
r := NewRestartableBackupItemAction(name, p)
a, err := r.getDelegate()
assert.Nil(t, a)
assert.EqualError(t, err, "reset error")
require.EqualError(t, err, "reset error")
// Happy path
p.On("ResetIfNeeded").Return(nil)
@@ -97,7 +97,7 @@ func TestRestartableBackupItemActionGetDelegate(t *testing.T) {
p.On("GetByKindAndName", key).Return(expected, nil)
a, err = r.getDelegate()
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, expected, a)
}
pkg/plugin/clientmgmt/itemblockaction/v1/restartable_item_block_action_test.go
+2 -2
View File
@@ -88,7 +88,7 @@ func TestRestartableItemBlockActionGetDelegate(t *testing.T) {
r := NewRestartableItemBlockAction(name, p)
a, err := r.getDelegate()
assert.Nil(t, a)
assert.EqualError(t, err, "reset error")
require.EqualError(t, err, "reset error")
// Happy path
p.On("ResetIfNeeded").Return(nil)
@@ -97,7 +97,7 @@ func TestRestartableItemBlockActionGetDelegate(t *testing.T) {
p.On("GetByKindAndName", key).Return(expected, nil)
a, err = r.getDelegate()
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, expected, a)
}
pkg/plugin/clientmgmt/manager_test.go
+3 -3
View File
@@ -108,7 +108,7 @@ func TestGetRestartableProcess(t *testing.T) {
registry.On("Get", pluginKind, pluginName).Return(nil, errors.Errorf("registry")).Once()
rp, err := m.getRestartableProcess(pluginKind, pluginName)
assert.Nil(t, rp)
assert.EqualError(t, err, "registry")
require.EqualError(t, err, "registry")
// Test 2: registry ok, factory error
podID := framework.PluginIdentifier{
@@ -120,7 +120,7 @@ func TestGetRestartableProcess(t *testing.T) {
factory.On("NewRestartableProcess", podID.Command, logger, logLevel).Return(nil, errors.Errorf("factory")).Once()
rp, err = m.getRestartableProcess(pluginKind, pluginName)
assert.Nil(t, rp)
assert.EqualError(t, err, "factory")
require.EqualError(t, err, "factory")
// Test 3: registry ok, factory ok
restartableProcess := &restartabletest.MockRestartableProcess{}
@@ -310,7 +310,7 @@ func getPluginTest(
factory.On("NewRestartableProcess", pluginID.Command, logger, logLevel).Return(nil, errors.Errorf("NewRestartableProcess")).Once()
actual, err := getPluginFunc(m, pluginName)
assert.Nil(t, actual)
assert.EqualError(t, err, "NewRestartableProcess")
require.EqualError(t, err, "NewRestartableProcess")
// Test 2: happy path
factory.On("NewRestartableProcess", pluginID.Command, logger, logLevel).Return(restartableProcess, nil).Once()
pkg/plugin/clientmgmt/restartable_delete_item_action_test.go
+2 -2
View File
@@ -87,7 +87,7 @@ func TestRestartableDeleteItemActionGetDelegate(t *testing.T) {
r := NewRestartableDeleteItemAction(name, p)
a, err := r.getDelegate()
assert.Nil(t, a)
assert.EqualError(t, err, "reset error")
require.EqualError(t, err, "reset error")
// Happy path
// Currently broken since this mocks out the restore item action interface
@@ -97,7 +97,7 @@ func TestRestartableDeleteItemActionGetDelegate(t *testing.T) {
p.On("GetByKindAndName", key).Return(expected, nil)
a, err = r.getDelegate()
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, expected, a)
}
pkg/plugin/clientmgmt/restartable_object_store_test.go
+7 -7
View File
@@ -97,7 +97,7 @@ func TestRestartableObjectStoreReinitialize(t *testing.T) {
}
err := r.Reinitialize(3)
assert.EqualError(t, err, "plugin int is not a ObjectStore")
require.EqualError(t, err, "plugin int is not a ObjectStore")
objectStore := new(providermocks.ObjectStore)
objectStore.Test(t)
@@ -105,7 +105,7 @@ func TestRestartableObjectStoreReinitialize(t *testing.T) {
objectStore.On("Init", r.config).Return(errors.Errorf("init error")).Once()
err = r.Reinitialize(objectStore)
assert.EqualError(t, err, "init error")
require.EqualError(t, err, "init error")
objectStore.On("Init", r.config).Return(nil)
err = r.Reinitialize(objectStore)
@@ -127,7 +127,7 @@ func TestRestartableObjectStoreGetDelegate(t *testing.T) {
}
a, err := r.getDelegate()
assert.Nil(t, a)
assert.EqualError(t, err, "reset error")
require.EqualError(t, err, "reset error")
// Happy path
p.On("ResetIfNeeded").Return(nil)
@@ -137,7 +137,7 @@ func TestRestartableObjectStoreGetDelegate(t *testing.T) {
p.On("GetByKindAndName", key).Return(objectStore, nil)
a, err = r.getDelegate()
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, objectStore, a)
}
@@ -159,7 +159,7 @@ func TestRestartableObjectStoreInit(t *testing.T) {
"color": "blue",
}
err := r.Init(config)
assert.EqualError(t, err, "GetByKindAndName error")
require.EqualError(t, err, "GetByKindAndName error")
// Delegate returns error
objectStore := new(providermocks.ObjectStore)
@@ -169,7 +169,7 @@ func TestRestartableObjectStoreInit(t *testing.T) {
objectStore.On("Init", config).Return(errors.Errorf("Init error")).Once()
err = r.Init(config)
assert.EqualError(t, err, "Init error")
require.EqualError(t, err, "Init error")
// wipe this out because the previous failed Init call set it
r.config = nil
@@ -177,7 +177,7 @@ func TestRestartableObjectStoreInit(t *testing.T) {
// Happy path
objectStore.On("Init", config).Return(nil)
err = r.Init(config)
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, config, r.config)
// Calling Init twice is forbidden
pkg/plugin/clientmgmt/restoreitemaction/v1/restartable_restore_item_action_test.go
+2 -2
View File
@@ -87,7 +87,7 @@ func TestRestartableRestoreItemActionGetDelegate(t *testing.T) {
r := NewRestartableRestoreItemAction(name, p)
a, err := r.getDelegate()
assert.Nil(t, a)
assert.EqualError(t, err, "reset error")
require.EqualError(t, err, "reset error")
// Happy path
p.On("ResetIfNeeded").Return(nil)
@@ -96,7 +96,7 @@ func TestRestartableRestoreItemActionGetDelegate(t *testing.T) {
p.On("GetByKindAndName", key).Return(expected, nil)
a, err = r.getDelegate()
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, expected, a)
}
pkg/plugin/clientmgmt/restoreitemaction/v2/restartable_restore_item_action_test.go
+2 -2
View File
@@ -87,7 +87,7 @@ func TestRestartableRestoreItemActionGetDelegate(t *testing.T) {
r := NewRestartableRestoreItemAction(name, p)
a, err := r.getDelegate()
assert.Nil(t, a)
assert.EqualError(t, err, "reset error")
require.EqualError(t, err, "reset error")
// Happy path
p.On("ResetIfNeeded").Return(nil)
@@ -96,7 +96,7 @@ func TestRestartableRestoreItemActionGetDelegate(t *testing.T) {
p.On("GetByKindAndName", key).Return(expected, nil)
a, err = r.getDelegate()
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, expected, a)
}
pkg/plugin/clientmgmt/volumesnapshotter/v1/restartable_volume_snapshotter_test.go
+7 -7
View File
@@ -96,7 +96,7 @@ func TestRestartableVolumeSnapshotterReinitialize(t *testing.T) {
}
err := r.Reinitialize(3)
assert.EqualError(t, err, "plugin int is not a VolumeSnapshotter")
require.EqualError(t, err, "plugin int is not a VolumeSnapshotter")
volumeSnapshotter := new(providermocks.VolumeSnapshotter)
volumeSnapshotter.Test(t)
@@ -104,7 +104,7 @@ func TestRestartableVolumeSnapshotterReinitialize(t *testing.T) {
volumeSnapshotter.On("Init", r.config).Return(errors.Errorf("init error")).Once()
err = r.Reinitialize(volumeSnapshotter)
assert.EqualError(t, err, "init error")
require.EqualError(t, err, "init error")
volumeSnapshotter.On("Init", r.config).Return(nil)
err = r.Reinitialize(volumeSnapshotter)
@@ -126,7 +126,7 @@ func TestRestartableVolumeSnapshotterGetDelegate(t *testing.T) {
}
a, err := r.getDelegate()
assert.Nil(t, a)
assert.EqualError(t, err, "reset error")
require.EqualError(t, err, "reset error")
// Happy path
p.On("ResetIfNeeded").Return(nil)
@@ -136,7 +136,7 @@ func TestRestartableVolumeSnapshotterGetDelegate(t *testing.T) {
p.On("GetByKindAndName", key).Return(volumeSnapshotter, nil)
a, err = r.getDelegate()
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, volumeSnapshotter, a)
}
@@ -158,7 +158,7 @@ func TestRestartableVolumeSnapshotterInit(t *testing.T) {
"color": "blue",
}
err := r.Init(config)
assert.EqualError(t, err, "GetByKindAndName error")
require.EqualError(t, err, "GetByKindAndName error")
// Delegate returns error
volumeSnapshotter := new(providermocks.VolumeSnapshotter)
@@ -168,7 +168,7 @@ func TestRestartableVolumeSnapshotterInit(t *testing.T) {
volumeSnapshotter.On("Init", config).Return(errors.Errorf("Init error")).Once()
err = r.Init(config)
assert.EqualError(t, err, "Init error")
require.EqualError(t, err, "Init error")
// wipe this out because the previous failed Init call set it
r.config = nil
@@ -176,7 +176,7 @@ func TestRestartableVolumeSnapshotterInit(t *testing.T) {
// Happy path
volumeSnapshotter.On("Init", config).Return(nil)
err = r.Init(config)
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, config, r.config)
// Calling Init twice is forbidden
pkg/plugin/framework/validation_test.go
+9 -8
View File
@@ -20,18 +20,19 @@ import (
"testing"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
func TestValidateConfigKeys(t *testing.T) {
assert.NoError(t, validateConfigKeys(nil))
assert.NoError(t, validateConfigKeys(map[string]string{}))
assert.NoError(t, validateConfigKeys(map[string]string{"foo": "bar"}, "foo"))
assert.NoError(t, validateConfigKeys(map[string]string{"foo": "bar", "bar": "baz"}, "foo", "bar"))
require.NoError(t, validateConfigKeys(nil))
require.NoError(t, validateConfigKeys(map[string]string{}))
require.NoError(t, validateConfigKeys(map[string]string{"foo": "bar"}, "foo"))
require.NoError(t, validateConfigKeys(map[string]string{"foo": "bar", "bar": "baz"}, "foo", "bar"))
assert.Error(t, validateConfigKeys(map[string]string{"foo": "bar"}))
assert.Error(t, validateConfigKeys(map[string]string{"foo": "bar"}, "Foo"))
assert.Error(t, validateConfigKeys(map[string]string{"foo": "bar", "boo": ""}, "foo"))
require.Error(t, validateConfigKeys(map[string]string{"foo": "bar"}))
require.Error(t, validateConfigKeys(map[string]string{"foo": "bar"}, "Foo"))
require.Error(t, validateConfigKeys(map[string]string{"foo": "bar", "boo": ""}, "foo"))
assert.NoError(t, ValidateObjectStoreConfigKeys(map[string]string{"bucket": "foo"}))
require.NoError(t, ValidateObjectStoreConfigKeys(map[string]string{"bucket": "foo"}))
assert.Error(t, ValidateVolumeSnapshotterConfigKeys(map[string]string{"bucket": "foo"}))
}