test: adjusting unittest

Author: nexus49

controller/lifecycle/conditions_test.go

@@ -4,6 +4,7 @@ import (
 	"errors"
 	"fmt"
 	"testing"
+	"time"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -177,7 +178,7 @@ func TestSubroutineCondition(t *testing.T) {
 		subroutine := changeStatusSubroutine{}
 
 		// When
-		setSubroutineCondition(&condition, subroutine, controllerruntime.Result{Requeue: true}, nil, false, log)
+		setSubroutineCondition(&condition, subroutine, controllerruntime.Result{RequeueAfter: 1 * time.Second}, nil, false, log)
 
 		// Then
 		assert.Equal(t, 1, len(condition))
@@ -219,7 +220,7 @@ func TestSubroutineCondition(t *testing.T) {
 		subroutine := changeStatusSubroutine{}
 
 		// When
-		setSubroutineCondition(&condition, subroutine, controllerruntime.Result{Requeue: true}, nil, true, log)
+		setSubroutineCondition(&condition, subroutine, controllerruntime.Result{RequeueAfter: 1 * time.Second}, nil, true, log)
 
 		// Then
 		assert.Equal(t, 1, len(condition))

controller/lifecycle/finalizerSubroutine_test.go

@@ -16,7 +16,6 @@ const subroutineFinalizer = "finalizer"
 type finalizerSubroutine struct {
 	client       client.Client
 	err          error
-	requeue      bool
 	requeueAfter time.Duration
 }
 
@@ -30,9 +29,6 @@ func (c finalizerSubroutine) Finalize(_ context.Context, _ RuntimeObject) (contr
 	if c.err != nil {
 		return controllerruntime.Result{}, errors.NewOperatorError(c.err, true, true)
 	}
-	if c.requeue {
-		return controllerruntime.Result{Requeue: true}, nil
-	}
 	if c.requeueAfter > 0 {
 		return controllerruntime.Result{RequeueAfter: c.requeueAfter}, nil
 	}

controller/lifecycle/lifecycle_test.go

@@ -133,8 +133,8 @@ func TestLifecycle(t *testing.T) {
 
 		mgr, _ := createLifecycleManager([]Subroutine{
 			finalizerSubroutine{
-				client:  fakeClient,
-				requeue: true,
+				client:       fakeClient,
+				requeueAfter: 1 * time.Second,
 			},
 		}, fakeClient)
 
@@ -143,7 +143,7 @@ func TestLifecycle(t *testing.T) {
 
 		assert.NoError(t, err)
 		assert.Equal(t, 1, len(instance.Finalizers))
-		assert.Equal(t, time.Duration(0), res.RequeueAfter)
+		assert.Equal(t, time.Duration(1*time.Second), res.RequeueAfter)
 	})
 
 	t.Run("Lifecycle with a finalizer - finalization(requeueAfter)", func(t *testing.T) {