mirrors/velero
1
0
Fork 0
mirror of https://github.com/vmware-tanzu/velero.git synced 2026-09-20 15:04:17 +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/controller/pod_volume_backup_controller_test.go
+10 -10
View File
@@ -510,9 +510,9 @@ func TestPVBReconcile(t *testing.T) {
})
if test.expectedErr != "" {
assert.EqualError(t, err, test.expectedErr)
require.EqualError(t, err, test.expectedErr)
} else {
assert.NoError(t, err)
require.NoError(t, err)
}
if test.expectedResult != nil {
@@ -562,11 +562,11 @@ func TestOnPVBCancelled(t *testing.T) {
namespace := pvb.Namespace
pvbName := pvb.Name
assert.NoError(t, r.client.Create(ctx, pvb))
require.NoError(t, r.client.Create(ctx, pvb))
r.OnDataPathCancelled(ctx, namespace, pvbName)
updatedPvb := &velerov1api.PodVolumeBackup{}
assert.NoError(t, r.client.Get(ctx, types.NamespacedName{Name: pvbName, Namespace: namespace}, updatedPvb))
require.NoError(t, r.client.Get(ctx, types.NamespacedName{Name: pvbName, Namespace: namespace}, updatedPvb))
assert.Equal(t, velerov1api.PodVolumeBackupPhaseCanceled, updatedPvb.Status.Phase)
assert.False(t, updatedPvb.Status.CompletionTimestamp.IsZero())
assert.False(t, updatedPvb.Status.StartTimestamp.IsZero())
@@ -614,7 +614,7 @@ func TestOnPVBProgress(t *testing.T) {
namespace := pvb.Namespace
pvbName := pvb.Name
assert.NoError(t, r.client.Create(context.Background(), pvb))
require.NoError(t, r.client.Create(context.Background(), pvb))
// Create a Progress object
progress := &uploader.Progress{
@@ -625,7 +625,7 @@ func TestOnPVBProgress(t *testing.T) {
r.OnDataPathProgress(ctx, namespace, pvbName, progress)
if len(test.needErrs) != 0 && !test.needErrs[0] {
updatedPvb := &velerov1api.PodVolumeBackup{}
assert.NoError(t, r.client.Get(ctx, types.NamespacedName{Name: pvbName, Namespace: namespace}, updatedPvb))
require.NoError(t, r.client.Get(ctx, types.NamespacedName{Name: pvbName, Namespace: namespace}, updatedPvb))
assert.Equal(t, test.progress.TotalBytes, updatedPvb.Status.Progress.TotalBytes)
assert.Equal(t, test.progress.BytesDone, updatedPvb.Status.Progress.BytesDone)
}
@@ -642,11 +642,11 @@ func TestOnPvbFailed(t *testing.T) {
namespace := pvb.Namespace
pvbName := pvb.Name
assert.NoError(t, r.client.Create(ctx, pvb))
require.NoError(t, r.client.Create(ctx, pvb))
r.OnDataPathFailed(ctx, namespace, pvbName, fmt.Errorf("Failed to handle %v", pvbName))
updatedPvb := &velerov1api.PodVolumeBackup{}
assert.NoError(t, r.client.Get(ctx, types.NamespacedName{Name: pvbName, Namespace: namespace}, updatedPvb))
require.NoError(t, r.client.Get(ctx, types.NamespacedName{Name: pvbName, Namespace: namespace}, updatedPvb))
assert.Equal(t, velerov1api.PodVolumeBackupPhaseFailed, updatedPvb.Status.Phase)
assert.False(t, updatedPvb.Status.CompletionTimestamp.IsZero())
assert.False(t, updatedPvb.Status.StartTimestamp.IsZero())
@@ -662,11 +662,11 @@ func TestOnPvbCompleted(t *testing.T) {
namespace := pvb.Namespace
pvbName := pvb.Name
assert.NoError(t, r.client.Create(ctx, pvb))
require.NoError(t, r.client.Create(ctx, pvb))
r.OnDataPathCompleted(ctx, namespace, pvbName, datapath.Result{})
updatedPvb := &velerov1api.PodVolumeBackup{}
assert.NoError(t, r.client.Get(ctx, types.NamespacedName{Name: pvbName, Namespace: namespace}, updatedPvb))
require.NoError(t, r.client.Get(ctx, types.NamespacedName{Name: pvbName, Namespace: namespace}, updatedPvb))
assert.Equal(t, velerov1api.PodVolumeBackupPhaseCompleted, updatedPvb.Status.Phase)
assert.False(t, updatedPvb.Status.CompletionTimestamp.IsZero())
}