fix(test): move the failed job test to the end.

Signed-off-by: Electronic-Waste <[email protected]>

Author: Electronic-Waste

pkg/controller.v1beta1/trial/trial_controller_test.go

@@ -56,6 +56,7 @@ const (
 )
 
 var (
+	startTime               = time.Now()
 	batchJobKey             = types.NamespacedName{Name: batchJobName, Namespace: namespace}
 	observationLogAvailable = &api_pb.GetObservationLogReply{
 		ObservationLog: &api_pb.ObservationLog{
@@ -180,67 +181,6 @@ func TestReconcileBatchJob(t *testing.T) {
 		g.Expect(mgr.Start(mgrCtx)).NotTo(gomega.HaveOccurred())
 	}()
 
-	t.Run(`Trial run with "Failed" BatchJob.`, func(t *testing.T) {
-		g := gomega.NewGomegaWithT(t)
-		mockManagerClient.EXPECT().DeleteTrialObservationLog(gomock.Any()).Return(nil, nil)
-
-		trial := newFakeTrialBatchJob(commonv1beta1.StdOutCollector, "test-failed-batch-job")
-		trialKey := types.NamespacedName{Name: "test-failed-batch-job", Namespace: namespace}
-		batchJob := &batchv1.Job{}
-
-		// Create the Trial with StdOut MC
-		g.Expect(c.Create(ctx, trial)).NotTo(gomega.HaveOccurred())
-
-		// Expect that BatchJob with appropriate name is created
-		g.Eventually(func(g gomega.Gomega) {
-			g.Expect(c.Get(ctx, batchJobKey, batchJob)).Should(gomega.Succeed())
-		}, timeout).Should(gomega.Succeed())
-
-		// Expect that Trial status is running
-		g.Eventually(func(g gomega.Gomega) {
-			g.Expect(c.Get(ctx, trialKey, trial)).Should(gomega.Succeed())
-			g.Expect(trial.IsRunning()).Should(gomega.BeTrue())
-		}, timeout).Should(gomega.Succeed())
-
-		// Manually update BatchJob status to failed
-		// Expect that Trial status is failed
-		g.Eventually(func(g gomega.Gomega) {
-			g.Expect(c.Get(ctx, batchJobKey, batchJob)).Should(gomega.Succeed())
-			batchJob.Status = batchv1.JobStatus{
-				Conditions: []batchv1.JobCondition{
-					{
-						Type:    batchv1.JobFailureTarget,
-						Status:  corev1.ConditionTrue,
-						Message: "BatchJob failed test message",
-						Reason:  "BatchJob failed test reason",
-					},
-					{
-						Type:    batchv1.JobFailed,
-						Status:  corev1.ConditionTrue,
-						Message: "BatchJob failed test message",
-						Reason:  "BatchJob failed test reason",
-					},
-				},
-				StartTime: &metav1.Time{Time: time.Now()},
-			}
-			g.Expect(c.Status().Update(ctx, batchJob)).Should(gomega.Succeed())
-			g.Expect(c.Get(ctx, trialKey, trial)).Should(gomega.Succeed())
-			g.Expect(trial.IsFailed()).Should(gomega.BeTrue())
-		}, timeout).Should(gomega.Succeed())
-
-		// Delete the Trial and Job
-		g.Expect(c.Delete(ctx, trial)).NotTo(gomega.HaveOccurred())
-		g.Expect(c.Delete(ctx, batchJob)).NotTo(gomega.HaveOccurred())
-
-		// Expect that Trial is deleted
-		// BatchJob can't be deleted because GC doesn't work in envtest and BatchJob stuck in termination phase.
-		// Ref: https://book.kubebuilder.io/reference/testing/envtest.html#testing-considerations.
-		g.Eventually(func(g gomega.Gomega) {
-			g.Expect(errors.IsNotFound(c.Get(ctx, trialKey, &trialsv1beta1.Trial{}))).Should(gomega.BeTrue())
-			g.Expect(errors.IsNotFound(c.Get(ctx, batchJobKey, &batchv1.Job{}))).Should(gomega.BeTrue())
-		}, timeout).Should(gomega.Succeed())
-	})
-
 	t.Run(`Trial with "Complete" BatchJob and Available metrics.`, func(t *testing.T) {
 		g := gomega.NewGomegaWithT(t)
 		gomock.InOrder(
@@ -258,7 +198,7 @@ func TestReconcileBatchJob(t *testing.T) {
 		g.Eventually(func(g gomega.Gomega) {
 			g.Expect(c.Get(ctx, batchJobKey, batchJob)).Should(gomega.Succeed())
 		}, timeout).Should(gomega.Succeed())
-		
+
 		// Update BatchJob status to Complete.
 		batchJobCompleteMessage := "BatchJob completed test message"
 		batchJobCompleteReason := "BatchJob completed test reason"
@@ -269,7 +209,7 @@ func TestReconcileBatchJob(t *testing.T) {
 					Type:    batchv1.JobSuccessCriteriaMet,
 					Status:  corev1.ConditionTrue,
 					Message: batchJobCompleteMessage,
-					Reason:  batchv1.JobReasonSuccessPolicy,
+					Reason:  batchJobCompleteReason,
 				},
 				{
 					Type:    batchv1.JobComplete,
@@ -278,7 +218,7 @@ func TestReconcileBatchJob(t *testing.T) {
 					Reason:  batchJobCompleteReason,
 				},
 			},
-			StartTime: &metav1.Time{Time: time.Now()},
+			StartTime: &metav1.Time{Time: startTime},
 		}
 		g.Expect(c.Status().Update(ctx, batchJob)).NotTo(gomega.HaveOccurred())
 
@@ -380,10 +320,78 @@ func TestReconcileBatchJob(t *testing.T) {
 		}, timeout).Should(gomega.Succeed())
 	})
 
+	t.Run(`Trial run with "Failed" BatchJob.`, func(t *testing.T) {
+		g := gomega.NewGomegaWithT(t)
+		mockManagerClient.EXPECT().DeleteTrialObservationLog(gomock.Any()).Return(nil, nil)
+
+		trial := newFakeTrialBatchJob(commonv1beta1.StdOutCollector, "test-failed-batch-job")
+		trialKey := types.NamespacedName{Name: "test-failed-batch-job", Namespace: namespace}
+		batchJob := &batchv1.Job{}
+
+		// Create the Trial with StdOut MC
+		g.Expect(c.Create(ctx, trial)).NotTo(gomega.HaveOccurred())
+
+		// Expect that BatchJob with appropriate name is created
+		g.Eventually(func(g gomega.Gomega) {
+			g.Expect(c.Get(ctx, batchJobKey, batchJob)).Should(gomega.Succeed())
+		}, timeout).Should(gomega.Succeed())
+
+		// Expect that Trial status is running
+		g.Eventually(func(g gomega.Gomega) {
+			g.Expect(c.Get(ctx, trialKey, trial)).Should(gomega.Succeed())
+			g.Expect(trial.IsRunning()).Should(gomega.BeTrue())
+		}, timeout).Should(gomega.Succeed())
+
+		// Manually update BatchJob status to failed
+		// Expect that Trial status is failed
+		batchJobFailedMessage := "BatchJob completed test message"
+		batchJobFailedReason := "BatchJob completed test reason"
+		g.Eventually(func(g gomega.Gomega) {
+			g.Expect(c.Get(ctx, batchJobKey, batchJob)).Should(gomega.Succeed())
+			batchJob.Status = batchv1.JobStatus{
+				Conditions: []batchv1.JobCondition{
+					{
+						Type:    batchv1.JobFailureTarget,
+						Status:  corev1.ConditionTrue,
+						Message: batchJobFailedMessage,
+						Reason:  batchJobFailedReason,
+					},
+					{
+						Type:    batchv1.JobFailed,
+						Status:  corev1.ConditionTrue,
+						Message: batchJobFailedMessage,
+						Reason:  batchJobFailedReason,
+					},
+					{
+						Type:    batchv1.JobSuccessCriteriaMet,
+						Status:  corev1.ConditionFalse,
+						Message: batchJobFailedMessage,
+						Reason:  batchJobFailedReason,
+					},
+				},
+				StartTime: &metav1.Time{Time: startTime},
+			}
+			g.Expect(c.Status().Update(ctx, batchJob)).Should(gomega.Succeed())
+			g.Expect(c.Get(ctx, trialKey, trial)).Should(gomega.Succeed())
+			g.Expect(trial.IsFailed()).Should(gomega.BeTrue())
+		}, timeout).Should(gomega.Succeed())
+
+		// Delete the Trial
+		g.Expect(c.Delete(ctx, trial)).NotTo(gomega.HaveOccurred())
+
+		// Expect that Trial is deleted
+		// BatchJob can't be deleted because GC doesn't work in envtest and BatchJob stuck in termination phase.
+		// Ref: https://book.kubebuilder.io/reference/testing/envtest.html#testing-considerations.
+		g.Eventually(func(g gomega.Gomega) {
+			g.Expect(errors.IsNotFound(c.Get(ctx, trialKey, &trialsv1beta1.Trial{}))).Should(gomega.BeTrue())
+		}, timeout).Should(gomega.Succeed())
+	})
+
 	t.Run("Update status for empty Trial", func(t *testing.T) {
 		g := gomega.NewGomegaWithT(t)
 		g.Expect(r.updateStatus(&trialsv1beta1.Trial{})).To(gomega.HaveOccurred())
 	})
+
 }
 
 func TestGetObjectiveMetricValue(t *testing.T) {