fix(test): update job status first in failed test.

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

Author: Electronic-Waste

pkg/controller.v1beta1/trial/trial_controller_test.go

@@ -326,55 +326,44 @@ func TestReconcileBatchJob(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}
+		// Manually update BatchJob status to failed
 		batchJob := &batchv1.Job{}
+		batchJobFailedMessage := "BatchJob completed test message"
+		batchJobFailedReason := "BatchJob completed test reason"
+		g.Expect(c.Get(ctx, batchJobKey, batchJob)).NotTo(gomega.HaveOccurred())
+		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())
 
 		// Create the Trial with StdOut MC
+		trial := newFakeTrialBatchJob(commonv1beta1.StdOutCollector, "test-failed-batch-job")
+		trialKey := types.NamespacedName{Name: "test-failed-batch-job", Namespace: namespace}
 		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())
-			t.Log(*trial)
-			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())