Skip Tests that Write to Job Status During EnvTest Existing Runs

andrewlecuyer · andrewlecuyer · commit 24f032537382 · 2025-05-21T14:32:36.000-05:00
diff --git a/internal/controller/postgrescluster/postgres_test.go b/internal/controller/postgrescluster/postgres_test.go
@@ -9,6 +9,8 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	"os"
+	"strings"
 	"testing"
 
 	"github.com/go-logr/logr/funcr"
@@ -526,6 +528,9 @@ volumeMode: Filesystem
 	})
 
 	t.Run("DataVolumeSourceClusterWithGoodSnapshot", func(t *testing.T) {
+		if strings.EqualFold(os.Getenv("USE_EXISTING_CLUSTER"), "true") {
+			t.Skip("requires mocking of Job conditions")
+		}
 		cluster := testCluster()
 		ns := setupNamespace(t, tClient)
 		cluster.Namespace = ns.Name
diff --git a/internal/controller/postgrescluster/snapshots_test.go b/internal/controller/postgrescluster/snapshots_test.go
@@ -6,6 +6,8 @@ package postgrescluster
 
 import (
 	"context"
+	"os"
+	"strings"
 	"testing"
 	"time"
 
@@ -180,6 +182,9 @@ func TestReconcileVolumeSnapshots(t *testing.T) {
 	})
 
 	t.Run("SnapshotsEnabledReadySnapshotsExist", func(t *testing.T) {
+		if strings.EqualFold(os.Getenv("USE_EXISTING_CLUSTER"), "true") {
+			t.Skip("requires mocking of Job conditions")
+		}
 		// Create a volume snapshot class
 		volumeSnapshotClassName := "my-snapshotclass"
 		volumeSnapshotClass := &volumesnapshotv1.VolumeSnapshotClass{
@@ -454,6 +459,9 @@ func TestReconcileDedicatedSnapshotVolume(t *testing.T) {
 	})
 
 	t.Run("SnapshotsEnabledBackupExistsCreateRestore", func(t *testing.T) {
+		if strings.EqualFold(os.Getenv("USE_EXISTING_CLUSTER"), "true") {
+			t.Skip("requires mocking of Job conditions")
+		}
 		// Create cluster with snapshots enabled
 		ns := setupNamespace(t, cc)
 		cluster := testCluster()
@@ -499,6 +507,9 @@ func TestReconcileDedicatedSnapshotVolume(t *testing.T) {
 	})
 
 	t.Run("SnapshotsEnabledSuccessfulRestoreExists", func(t *testing.T) {
+		if strings.EqualFold(os.Getenv("USE_EXISTING_CLUSTER"), "true") {
+			t.Skip("requires mocking of Job conditions")
+		}
 		// Create cluster with snapshots enabled
 		ns := setupNamespace(t, cc)
 		cluster := testCluster()
@@ -561,6 +572,9 @@ func TestReconcileDedicatedSnapshotVolume(t *testing.T) {
 	})
 
 	t.Run("SnapshotsEnabledFailedRestoreExists", func(t *testing.T) {
+		if strings.EqualFold(os.Getenv("USE_EXISTING_CLUSTER"), "true") {
+			t.Skip("requires mocking of Job conditions")
+		}
 		// Create cluster with snapshots enabled
 		ns := setupNamespace(t, cc)
 		cluster := testCluster()
@@ -837,6 +851,9 @@ func TestGetLatestCompleteBackupJob(t *testing.T) {
 	})
 
 	t.Run("OneCompleteBackupJob", func(t *testing.T) {
+		if strings.EqualFold(os.Getenv("USE_EXISTING_CLUSTER"), "true") {
+			t.Skip("requires mocking of Job conditions")
+		}
 		currentTime := metav1.Now()
 		currentStartTime := metav1.NewTime(currentTime.AddDate(0, 0, -1))
 
@@ -864,6 +881,9 @@ func TestGetLatestCompleteBackupJob(t *testing.T) {
 	})
 
 	t.Run("TwoCompleteBackupJobs", func(t *testing.T) {
+		if strings.EqualFold(os.Getenv("USE_EXISTING_CLUSTER"), "true") {
+			t.Skip("requires mocking of Job conditions")
+		}
 		currentTime := metav1.Now()
 		currentStartTime := metav1.NewTime(currentTime.AddDate(0, 0, -1))
 		earlierTime := metav1.NewTime(currentTime.AddDate(-1, 0, 0))
