Deflake TestReconcileReplicaCreateBackup (CrunchyData#3198)

benjaminjb · web-flow · commit e746b2847d84 · 2022-05-11T16:22:28.000-05:00
TestReconcileReplicaCreateBackup was flaking in envtest-existing
runs; experimentation revealed this was due to garbage collection.

Following current practice, this PR skips the test in envtest-existing
runs.

Issue [sc-14382]
diff --git a/internal/controller/postgrescluster/pgbackrest.go b/internal/controller/postgrescluster/pgbackrest.go
@@ -2270,8 +2270,8 @@ func (r *Reconciler) reconcileReplicaCreateBackup(ctx context.Context,
 	replicaCreateRepo v1beta1.PGBackRestRepo) error {
 
 	var replicaCreateRepoStatus *v1beta1.RepoStatus
-	for i, r := range postgresCluster.Status.PGBackRest.Repos {
-		if r.Name == replicaCreateRepo.Name {
+	for i, repo := range postgresCluster.Status.PGBackRest.Repos {
+		if repo.Name == replicaCreateRepo.Name {
 			replicaCreateRepoStatus = &postgresCluster.Status.PGBackRest.Repos[i]
 			break
 		}
@@ -2494,8 +2494,8 @@ func (r *Reconciler) reconcileStanzaCreate(ctx context.Context,
 			return
 		}
 		replicaCreateRepoName := postgresCluster.Spec.Backups.PGBackRest.Repos[0].Name
-		for i, r := range postgresCluster.Status.PGBackRest.Repos {
-			if r.Name == replicaCreateRepoName {
+		for i, repo := range postgresCluster.Status.PGBackRest.Repos {
+			if repo.Name == replicaCreateRepoName {
 				replicaCreateRepoStatus = &postgresCluster.Status.PGBackRest.Repos[i]
 				break
 			}
diff --git a/internal/controller/postgrescluster/pgbackrest_test.go b/internal/controller/postgrescluster/pgbackrest_test.go
@@ -848,6 +848,11 @@ func TestGetPGBackRestExecSelector(t *testing.T) {
 }
 
 func TestReconcileReplicaCreateBackup(t *testing.T) {
+	// Garbage collector cleans up test resources before the test completes
+	if strings.EqualFold(os.Getenv("USE_EXISTING_CLUSTER"), "true") {
+		t.Skip("USE_EXISTING_CLUSTER: Test fails due to garbage collection")
+	}
+
 	ctx := context.Background()
 	_, tClient := setupKubernetes(t)
 	require.ParallelCapacity(t, 1)
@@ -908,6 +913,7 @@ func TestReconcileReplicaCreateBackup(t *testing.T) {
 	// now find the expected job
 	jobs := &batchv1.JobList{}
 	err = tClient.List(ctx, jobs, &client.ListOptions{
+		Namespace: postgresCluster.Namespace,
 		LabelSelector: naming.PGBackRestBackupJobSelector(clusterName, replicaCreateRepo.Name,
 			naming.BackupReplicaCreate),
 	})
@@ -994,8 +1000,8 @@ func TestReconcileReplicaCreateBackup(t *testing.T) {
 
 	// verify the status has been updated properly
 	var replicaCreateRepoStatus *v1beta1.RepoStatus
-	for i, r := range postgresCluster.Status.PGBackRest.Repos {
-		if r.Name == replicaCreateRepo.Name {
+	for i, repo := range postgresCluster.Status.PGBackRest.Repos {
+		if repo.Name == replicaCreateRepo.Name {
 			replicaCreateRepoStatus = &postgresCluster.Status.PGBackRest.Repos[i]
 			break
 		}
