fix test

Author: gkech

internal/controller/postgrescluster/helpers_test.go

@@ -141,14 +141,14 @@ func testCluster() *v1beta1.PostgresCluster {
 	return cluster.DeepCopy()
 }
 
-func testBackupJob(cluster *v1beta1.PostgresCluster) *batchv1.Job {
+func testBackupJob(cluster *v1beta1.PostgresCluster, name string) *batchv1.Job {
 	job := batchv1.Job{
 		TypeMeta: metav1.TypeMeta{
 			APIVersion: batchv1.SchemeGroupVersion.String(),
 			Kind:       "Job",
 		},
 		ObjectMeta: metav1.ObjectMeta{
-			Name:      "backup-job-1",
+			Name:      name,
 			Namespace: cluster.Namespace,
 			Labels: map[string]string{
 				naming.LabelCluster:          cluster.Name,

internal/controller/postgrescluster/snapshots_test.go

@@ -493,7 +493,7 @@ func TestReconcileDedicatedSnapshotVolume(t *testing.T) {
 		t.Cleanup(func() { assert.Check(t, r.Client.Delete(ctx, cluster)) })
 
 		// Create successful backup job
-		backupJob := testBackupJob(cluster)
+		backupJob := testBackupJob(cluster, "backup-job-snapshots-enabled-1")
 		err = errors.WithStack(r.setControllerReference(cluster, backupJob))
 		assert.NilError(t, err)
 		err = r.apply(ctx, backupJob)
@@ -562,7 +562,7 @@ func TestReconcileDedicatedSnapshotVolume(t *testing.T) {
 		earlierTime := metav1.NewTime(currentTime.AddDate(-1, 0, 0))
 
 		// Create successful backup job
-		backupJob := testBackupJob(cluster)
+		backupJob := testBackupJob(cluster, "backup-job-snapshots-enabled-exists-1")
 		err = errors.WithStack(r.setControllerReference(cluster, backupJob))
 		assert.NilError(t, err)
 		err = r.apply(ctx, backupJob)
@@ -665,7 +665,7 @@ func TestReconcileDedicatedSnapshotVolume(t *testing.T) {
 		earlierTime := metav1.NewTime(currentTime.AddDate(-1, 0, 0))
 
 		// Create successful backup job
-		backupJob := testBackupJob(cluster)
+		backupJob := testBackupJob(cluster, "backup-job-snapshots-enabled-failed-exists-1")
 		err = errors.WithStack(r.setControllerReference(cluster, backupJob))
 		assert.NilError(t, err)
 		err = r.apply(ctx, backupJob)
@@ -796,7 +796,7 @@ func TestDedicatedSnapshotVolumeRestore(t *testing.T) {
 	sts := &appsv1.StatefulSet{}
 	generateInstanceStatefulSetIntent(ctx, cluster, &cluster.Spec.InstanceSets[0], "pod-service", "service-account", sts, 1)
 	currentTime := metav1.Now()
-	backupJob := testBackupJob(cluster)
+	backupJob := testBackupJob(cluster, "backup-job-dedicated-snapshot-exists-1")
 	backupJob.Status.CompletionTime = &currentTime
 
 	err := r.dedicatedSnapshotVolumeRestore(ctx, cluster, pvc, backupJob)
@@ -954,7 +954,7 @@ func TestGetLatestCompleteBackupJob(t *testing.T) {
 	})
 
 	t.Run("NoCompleteJobs", func(t *testing.T) {
-		job1 := testBackupJob(cluster)
+		job1 := testBackupJob(cluster, "backup-job-latest-complete-1")
 		job1.Namespace = ns.Name
 
 		err := r.apply(ctx, job1)
@@ -968,13 +968,13 @@ func TestGetLatestCompleteBackupJob(t *testing.T) {
 	t.Run("OneCompleteBackupJob", func(t *testing.T) {
 		currentTime := metav1.Now()
 
-		job1 := testBackupJob(cluster)
+		job1 := testBackupJob(cluster, "backup-job-one-complete-1")
 		job1.Namespace = ns.Name
 
 		err := r.apply(ctx, job1)
 		assert.NilError(t, err)
 
-		job2 := testBackupJob(cluster)
+		job2 := testBackupJob(cluster, "backup-job-one-complete-2")
 		job2.Namespace = ns.Name
 		job2.Name = "backup-job-2"
 
@@ -1018,15 +1018,14 @@ func TestGetLatestCompleteBackupJob(t *testing.T) {
 		earlierTime := metav1.NewTime(currentTime.AddDate(-1, 0, 0))
 		assert.Check(t, earlierTime.Before(&currentTime))
 
-		job1 := testBackupJob(cluster)
+		job1 := testBackupJob(cluster, "backup-job-two-complete-1")
 		job1.Namespace = ns.Name
 
 		err := r.apply(ctx, job1)
 		assert.NilError(t, err)
 
-		job2 := testBackupJob(cluster)
+		job2 := testBackupJob(cluster, "backup-job-two-complete-2")
 		job2.Namespace = ns.Name
-		job2.Name = "backup-job-2"
 
 		err = r.apply(ctx, job2)
 		assert.NilError(t, err)