refactor: extract stopWithRetry to shared test utility

Address code review feedback by extracting the duplicated stopWithRetry
function to a shared test utility package, following the DRY principle.

Changes:
- Add StopWithRetry to test/utils.go with comprehensive documentation
- Update api/v1/suite_test.go to use test.StopWithRetry
- Update internal/operator-controller/controllers/suite_test.go to use test.StopWithRetry
- Remove duplicate implementations from both files

This makes the retry logic easier to maintain - any updates only need to
be made in one place rather than in multiple test files.

Assisted-by: Cursor/Claude
Co-authored-by: Cursor <cursoragent@cursor.com>

Author: camilamacedo86

api/v1/suite_test.go

@@ -59,26 +59,7 @@ func TestMain(m *testing.M) {
 	code := m.Run()
 	// Use Eventually wrapper for graceful test environment teardown
 	// controller-runtime v0.23.0+ requires this to prevent timing-related errors
-	stopErr := stopWithRetry(testEnv, time.Minute, time.Second)
+	stopErr := test.StopWithRetry(testEnv, time.Minute, time.Second)
 	utilruntime.Must(stopErr)
 	os.Exit(code)
 }
-
-// stopWithRetry wraps testEnv.Stop() with retry logic for graceful shutdown
-func stopWithRetry(env interface{ Stop() error }, timeout, interval time.Duration) error {
-	deadline := time.Now().Add(timeout)
-	var lastErr error
-	for time.Now().Before(deadline) {
-		if err := env.Stop(); err == nil {
-			return nil
-		} else {
-			lastErr = err
-			log.Printf("stopWithRetry: env.Stop() failed during teardown, retrying in %s: %v", interval, err)
-		}
-		time.Sleep(interval)
-	}
-	if lastErr != nil {
-		log.Printf("stopWithRetry: timeout reached before successful teardown; last error: %v", lastErr)
-	}
-	return env.Stop() // Final attempt
-}

internal/operator-controller/controllers/suite_test.go

@@ -134,26 +134,7 @@ func TestMain(m *testing.M) {
 	code := m.Run()
 	// Use Eventually wrapper for graceful test environment teardown
 	// controller-runtime v0.23.0+ requires this to prevent timing-related errors
-	stopErr := stopWithRetry(testEnv, time.Minute, time.Second)
+	stopErr := test.StopWithRetry(testEnv, time.Minute, time.Second)
 	utilruntime.Must(stopErr)
 	os.Exit(code)
 }
-
-// stopWithRetry wraps testEnv.Stop() with retry logic for graceful shutdown
-func stopWithRetry(env interface{ Stop() error }, timeout, interval time.Duration) error {
-	deadline := time.Now().Add(timeout)
-	var lastErr error
-	for time.Now().Before(deadline) {
-		if err := env.Stop(); err == nil {
-			return nil
-		} else {
-			lastErr = err
-			log.Printf("stopWithRetry: env.Stop() failed during teardown, retrying in %s: %v", interval, err)
-		}
-		time.Sleep(interval)
-	}
-	if lastErr != nil {
-		log.Printf("stopWithRetry: timeout reached before successful teardown; last error: %v", lastErr)
-	}
-	return env.Stop() // Final attempt
-}

test/utils.go

@@ -1,10 +1,12 @@
 package test
 
 import (
+	"log"
 	"os"
 	"path"
 	"path/filepath"
 	"runtime"
+	"time"
 
 	"sigs.k8s.io/controller-runtime/pkg/envtest"
 )
@@ -53,3 +55,24 @@ func getFirstFoundEnvTestBinaryDir() string {
 	}
 	return ""
 }
+
+// StopWithRetry wraps testEnv.Stop() with retry logic for graceful shutdown.
+// This is useful for controller-runtime v0.23.0+ where direct calls to testEnv.Stop()
+// can fail intermittently due to graceful shutdown timing.
+func StopWithRetry(env interface{ Stop() error }, timeout, interval time.Duration) error {
+	deadline := time.Now().Add(timeout)
+	var lastErr error
+	for time.Now().Before(deadline) {
+		if err := env.Stop(); err == nil {
+			return nil
+		} else {
+			lastErr = err
+			log.Printf("StopWithRetry: env.Stop() failed during teardown, retrying in %s: %v", interval, err)
+		}
+		time.Sleep(interval)
+	}
+	if lastErr != nil {
+		log.Printf("StopWithRetry: timeout reached before successful teardown; last error: %v", lastErr)
+	}
+	return env.Stop() // Final attempt
+}