mirrors/velero
1
0
Fork 0
mirror of https://github.com/vmware-tanzu/velero.git synced 2026-09-30 03:36:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Delete Requeue from ctrl.Result, because Requeue is deprecated by controller-runtime.

Browse Source 
The change is used to address the linter issue after golangci-lint bump to v2.13.1.
Requeue is replaced by RequeueAfter.

Signed-off-by: Xun Jiang <xun.jiang@broadcom.com>
This commit is contained in:
Xun Jiang
2026-08-27 17:50:52 +08:00
parent 32db614154
commit 69dbce1fea
10 changed files with 30 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/controller/data_upload_controller_test.go
+3 -4
View File
@@ -478,7 +478,7 @@ func TestReconcile(t *testing.T) {
du: dataUploadBuilder().Finalizers([]string{DataUploadDownloadFinalizer}).Result(),
constrained: true,
expected: dataUploadBuilder().Finalizers([]string{DataUploadDownloadFinalizer}).Result(),
expectedResult: &ctrl.Result{Requeue: true, RequeueAfter: time.Second * 5},
expectedResult: &ctrl.Result{RequeueAfter: time.Second * 5},
},
{
name: "new du but accept failed",
@@ -548,7 +548,7 @@ func TestReconcile(t *testing.T) {
name: "Error in data path is concurrent limited",
du: dataUploadBuilder().Phase(velerov2alpha1api.DataUploadPhasePrepared).SnapshotType(fakeSnapshotType).Finalizers([]string{DataUploadDownloadFinalizer}).Node("test-node").Result(),
dataMgr: datapath.NewManager(0),
expectedResult: &ctrl.Result{Requeue: true, RequeueAfter: time.Second * 5},
expectedResult: &ctrl.Result{RequeueAfter: time.Second * 5},
},
{
name: "data path init error",
@@ -562,7 +562,7 @@ func TestReconcile(t *testing.T) {
du: dataUploadBuilder().Phase(velerov2alpha1api.DataUploadPhasePrepared).SnapshotType(fakeSnapshotType).Finalizers([]string{DataUploadDownloadFinalizer}).Node("test-node").Result(),
needErrs: []bool{false, false, true, false},
expected: dataUploadBuilder().Phase(velerov2alpha1api.DataUploadPhasePrepared).Finalizers([]string{DataUploadDownloadFinalizer}).Result(),
expectedResult: &ctrl.Result{Requeue: true, RequeueAfter: time.Second * 5},
expectedResult: &ctrl.Result{RequeueAfter: time.Second * 5},
},
{
name: "data path start error",
@@ -694,7 +694,6 @@ func TestReconcile(t *testing.T) {
}
if test.expectedResult != nil {
assert.Equal(t, test.expectedResult.Requeue, actualResult.Requeue)
assert.Equal(t, test.expectedResult.RequeueAfter, actualResult.RequeueAfter)
}