CLOUD-727 fix flaky test TestGetLatestCompleteBackupJob due to list order is non-deterministic (#1587)

* CLOUD-727 fix flaky test TestGetLatestCompleteBackupJob due to  list order is non-deterministic

* make it more readable

---------

Co-authored-by: Viacheslav Sarzhan <slava.sarzhan@percona.com>

Author: gkech

internal/controller/postgrescluster/snapshots_test.go

@@ -44,7 +44,7 @@ func TestReconcileVolumeSnapshots(t *testing.T) {
 		DiscoveryClient: discoveryClient,
 		Recorder:        recorder,
 	}
-	ns := setupNamespace(t, cc)
+	ns := require.Namespace(t, cc)
 
 	// Enable snapshots feature gate
 	gate := feature.NewGate()
@@ -368,7 +368,7 @@ func TestReconcileDedicatedSnapshotVolume(t *testing.T) {
 
 	t.Run("SnapshotsDisabledDeletePvc", func(t *testing.T) {
 		// Create cluster without snapshots spec
-		ns := setupNamespace(t, cc)
+		ns := require.Namespace(t, cc)
 		cluster := testCluster()
 		cluster.Namespace = ns.Name
 		cluster.ObjectMeta.UID = "the-uid-123"
@@ -425,7 +425,7 @@ func TestReconcileDedicatedSnapshotVolume(t *testing.T) {
 
 	t.Run("SnapshotsEnabledCreatePvcNoBackupNoRestore", func(t *testing.T) {
 		// Create cluster with snapshots enabled
-		ns := setupNamespace(t, cc)
+		ns := require.Namespace(t, cc)
 		cluster := testCluster()
 		cluster.Namespace = ns.Name
 		cluster.ObjectMeta.UID = "the-uid-123"
@@ -457,7 +457,7 @@ func TestReconcileDedicatedSnapshotVolume(t *testing.T) {
 
 	t.Run("SnapshotsEnabledBackupExistsCreateRestore", func(t *testing.T) {
 		// Create cluster with snapshots enabled
-		ns := setupNamespace(t, cc)
+		ns := require.Namespace(t, cc)
 		cluster := testCluster()
 		cluster.Namespace = ns.Name
 		cluster.ObjectMeta.UID = "the-uid-123"
@@ -521,7 +521,7 @@ func TestReconcileDedicatedSnapshotVolume(t *testing.T) {
 
 	t.Run("SnapshotsEnabledSuccessfulRestoreExists", func(t *testing.T) {
 		// Create cluster with snapshots enabled
-		ns := setupNamespace(t, cc)
+		ns := require.Namespace(t, cc)
 		cluster := testCluster()
 		cluster.Namespace = ns.Name
 		cluster.ObjectMeta.UID = "the-uid-123"
@@ -620,7 +620,7 @@ func TestReconcileDedicatedSnapshotVolume(t *testing.T) {
 
 	t.Run("SnapshotsEnabledFailedRestoreExists", func(t *testing.T) {
 		// Create cluster with snapshots enabled
-		ns := setupNamespace(t, cc)
+		ns := require.Namespace(t, cc)
 		cluster := testCluster()
 		cluster.Namespace = ns.Name
 		cluster.ObjectMeta.UID = "the-uid-123"
@@ -722,7 +722,7 @@ func TestCreateDedicatedSnapshotVolume(t *testing.T) {
 		Owner:  client.FieldOwner(t.Name()),
 	}
 
-	ns := setupNamespace(t, cc)
+	ns := require.Namespace(t, cc)
 	cluster := testCluster()
 	cluster.Namespace = ns.Name
 	cluster.ObjectMeta.UID = "the-uid-123"
@@ -750,7 +750,7 @@ func TestDedicatedSnapshotVolumeRestore(t *testing.T) {
 		Owner:  client.FieldOwner(t.Name()),
 	}
 
-	ns := setupNamespace(t, cc)
+	ns := require.Namespace(t, cc)
 	cluster := testCluster()
 	cluster.Namespace = ns.Name
 	cluster.ObjectMeta.UID = "the-uid-123"
@@ -791,7 +791,7 @@ func TestGenerateSnapshotOfDedicatedSnapshotVolume(t *testing.T) {
 		Client: cc,
 		Owner:  client.FieldOwner(t.Name()),
 	}
-	ns := setupNamespace(t, cc)
+	ns := require.Namespace(t, cc)
 
 	cluster := testCluster()
 	cluster.Namespace = ns.Name
@@ -822,7 +822,7 @@ func TestGenerateVolumeSnapshot(t *testing.T) {
 		Client: cc,
 		Owner:  client.FieldOwner(t.Name()),
 	}
-	ns := setupNamespace(t, cc)
+	ns := require.Namespace(t, cc)
 
 	cluster := testCluster()
 	cluster.Namespace = ns.Name
@@ -851,7 +851,7 @@ func TestGetDedicatedSnapshotVolumeRestoreJob(t *testing.T) {
 		Client: cc,
 		Owner:  client.FieldOwner(t.Name()),
 	}
-	ns := setupNamespace(t, cc)
+	ns := require.Namespace(t, cc)
 
 	cluster := testCluster()
 	cluster.Namespace = ns.Name
@@ -906,7 +906,7 @@ func TestGetLatestCompleteBackupJob(t *testing.T) {
 		Client: cc,
 		Owner:  client.FieldOwner(t.Name()),
 	}
-	ns := setupNamespace(t, cc)
+	ns := require.Namespace(t, cc)
 
 	cluster := testCluster()
 	cluster.Namespace = ns.Name
@@ -974,29 +974,23 @@ func TestGetLatestCompleteBackupJob(t *testing.T) {
 	})
 
 	t.Run("TwoCompleteBackupJobs", func(t *testing.T) {
-		currentTime := metav1.Now()
-		earlierTime := metav1.NewTime(currentTime.AddDate(-1, 0, 0))
-		assert.Check(t, earlierTime.Before(&currentTime))
+		oneYearAgo := metav1.NewTime(time.Now().AddDate(-1, 0, 0))
+		twoYearsAgo := metav1.NewTime(time.Now().AddDate(-2, 0, 0))
+		assert.Check(t, twoYearsAgo.Before(&oneYearAgo))
 
 		job1 := testBackupJob(cluster, "backup-job-two-complete-1")
 		job1.Namespace = ns.Name
 
-		err := r.apply(ctx, job1)
-		assert.NilError(t, err)
-
-		job2 := testBackupJob(cluster, "backup-job-two-complete-2")
-		job2.Namespace = ns.Name
-
-		assert.NilError(t, r.apply(ctx, job2))
+		assert.NilError(t, r.apply(ctx, job1))
 
 		// Get job1 and update Status.
 		assert.NilError(t, r.Client.Get(ctx, client.ObjectKeyFromObject(job1), job1))
 
 		job1.Status = batchv1.JobStatus{
 			Succeeded:      1,
-			CompletionTime: &currentTime,
+			CompletionTime: &oneYearAgo,
 			// K8SPG-714: ENVTEST_K8S_VERSION=1.32
-			StartTime: new(metav1.NewTime(currentTime.Add(-time.Minute))),
+			StartTime: new(metav1.NewTime(oneYearAgo.Add(-time.Minute))),
 			Conditions: []batchv1.JobCondition{
 				{
 					Type:    batchv1.JobSuccessCriteriaMet,
@@ -1014,14 +1008,19 @@ func TestGetLatestCompleteBackupJob(t *testing.T) {
 		}
 		assert.NilError(t, r.Client.Status().Update(ctx, job1))
 
+		job2 := testBackupJob(cluster, "backup-job-two-complete-2")
+		job2.Namespace = ns.Name
+
+		assert.NilError(t, r.apply(ctx, job2))
+
 		// Get job2 and update Status.
 		assert.NilError(t, r.Client.Get(ctx, client.ObjectKeyFromObject(job2), job2))
 
 		job2.Status = batchv1.JobStatus{
 			Succeeded:      1,
-			CompletionTime: &earlierTime,
+			CompletionTime: &twoYearsAgo,
 			// K8SPG-714: ENVTEST_K8S_VERSION=1.32
-			StartTime: new(metav1.NewTime(earlierTime.Add(-time.Minute))),
+			StartTime: new(metav1.NewTime(twoYearsAgo.Add(-time.Minute))),
 			Conditions: []batchv1.JobCondition{
 				{
 					Type:    batchv1.JobSuccessCriteriaMet,
@@ -1160,7 +1159,7 @@ func TestGetSnapshotsForCluster(t *testing.T) {
 		Client: cc,
 		Owner:  client.FieldOwner(t.Name()),
 	}
-	ns := setupNamespace(t, cc)
+	ns := require.Namespace(t, cc)
 
 	cluster := testCluster()
 	cluster.Namespace = ns.Name
@@ -1389,7 +1388,7 @@ func TestDeleteSnapshots(t *testing.T) {
 		Owner:           client.FieldOwner(t.Name()),
 		DiscoveryClient: discoveryClient,
 	}
-	ns := setupNamespace(t, cc)
+	ns := require.Namespace(t, cc)
 
 	cluster := testCluster()
 	cluster.Namespace = ns.Name