Fix: Fixed problems on e2e test (#100)

* Fixed problems on e2e test * removed duplicate By Statements Co-authored-by: Youn Jae Kim <[email protected]>
Azure · Aug 4, 2022 · 6adc723 · 6adc723
1 parent 6ec7e3f
commit 6adc723
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 17 deletions.
diff --git a/pkg/controllers/apply_controller.go b/pkg/controllers/apply_controller.go
@@ -426,7 +426,7 @@ func buildAppliedStatusCondition(err error, updated bool, observedGeneration int
 			Type:               ConditionTypeApplied,
 			Status:             metav1.ConditionFalse,
 			LastTransitionTime: metav1.Now(),
-			Reason:             "AppliedManifestFailed",
+			Reason:             "appliedManifestFailed",
 			Message:            fmt.Sprintf("Failed to apply manifest: %v", err),
 		}
 	}
@@ -437,7 +437,7 @@ func buildAppliedStatusCondition(err error, updated bool, observedGeneration int
 			Status:             metav1.ConditionTrue,
 			LastTransitionTime: metav1.Now(),
 			ObservedGeneration: observedGeneration,
-			Reason:             "appliedManifest updated",
+			Reason:             "appliedManifestUpdated",
 			Message:            "appliedManifest updated",
 		}
 	}
@@ -446,7 +446,7 @@ func buildAppliedStatusCondition(err error, updated bool, observedGeneration int
 		Status:             metav1.ConditionTrue,
 		LastTransitionTime: metav1.Now(),
 		ObservedGeneration: observedGeneration,
-		Reason:             "AppliedManifestComplete",
+		Reason:             "appliedManifestComplete",
 		Message:            "Apply manifest complete",
 	}
 }
@@ -460,7 +460,7 @@ func generateWorkAppliedStatusCondition(manifestConditions []workv1alpha1.Manife
 				Type:               ConditionTypeApplied,
 				Status:             metav1.ConditionFalse,
 				LastTransitionTime: metav1.Now(),
-				Reason:             "AppliedWorkFailed",
+				Reason:             "appliedWorkFailed",
 				Message:            "Failed to apply work",
 				ObservedGeneration: observedGeneration,
 			}
@@ -471,7 +471,7 @@ func generateWorkAppliedStatusCondition(manifestConditions []workv1alpha1.Manife
 		Type:               ConditionTypeApplied,
 		Status:             metav1.ConditionTrue,
 		LastTransitionTime: metav1.Now(),
-		Reason:             "AppliedWorkComplete",
+		Reason:             "appliedWorkComplete",
 		Message:            "Apply work complete",
 		ObservedGeneration: observedGeneration,
 	}
@@ -483,7 +483,7 @@ func generateWorkAvailableStatusCondition(status metav1.ConditionStatus, observe
 			Type:               ConditionTypeAvailable,
 			Status:             metav1.ConditionTrue,
 			LastTransitionTime: metav1.Now(),
-			Reason:             "AppliedWorkAvailable",
+			Reason:             "appliedWorkAvailable",
 			Message:            "This workload is available",
 			ObservedGeneration: observedGeneration,
 		}
@@ -493,7 +493,7 @@ func generateWorkAvailableStatusCondition(status metav1.ConditionStatus, observe
 		Type:               ConditionTypeAvailable,
 		Status:             metav1.ConditionFalse,
 		LastTransitionTime: metav1.Now(),
-		Reason:             "AppliedWorkFailed",
+		Reason:             "appliedWorkFailed",
 		Message:            "This workload is not fully available",
 		ObservedGeneration: observedGeneration,
 	}

diff --git a/tests/e2e/apply_test.go b/tests/e2e/apply_test.go
@@ -98,7 +98,7 @@ var WorkCreatedContext = func(description string, manifestFiles []string) bool {
 			mDetails = generateManifestDetails(manifestFiles)
 
 			workObj := createWorkObj(
-				utilrand.String(5),
+				getWorkName(5),
 				defaultWorkNamespace,
 				mDetails,
 			)
@@ -140,6 +140,17 @@ var WorkCreatedContext = func(description string, manifestFiles []string) bool {
 
 				return err
 			}, eventuallyTimeout, eventuallyInterval).ShouldNot(HaveOccurred())
+
+			By("verifying that corresponding conditions were created")
+			Eventually(func() bool {
+				work, err := retrieveWork(createdWork.Namespace, createdWork.Name)
+				if err != nil {
+					return false
+				}
+				appliedCondition := meta.IsStatusConditionTrue(work.Status.Conditions, "Applied")
+				availableCondition := meta.IsStatusConditionTrue(work.Status.Conditions, "Available")
+				return appliedCondition && availableCondition
+			}, eventuallyTimeout, eventuallyInterval).Should(BeTrue())
 		})
 	})
 }
@@ -154,7 +165,7 @@ var WorkCreatedWithCRDContext = func(description string, manifestFiles []string)
 			manifestDetails = generateManifestDetails(manifestFiles)
 
 			workObj := createWorkObj(
-				utilrand.String(5),
+				getWorkName(5),
 				defaultWorkNamespace,
 				manifestDetails,
 			)
@@ -192,7 +203,7 @@ var WorkUpdateWithDependencyContext = func(description string, initialManifestFi
 			addedManifestDetails = generateManifestDetails(addedManifestFiles)
 
 			workObj := createWorkObj(
-				utilrand.String(5),
+				getWorkName(5),
 				defaultWorkNamespace,
 				initialManifestDetails,
 			)
@@ -250,11 +261,11 @@ var WorkUpdateWithModifiedManifestContext = func(description string, manifestFil
 
 		BeforeEach(func() {
 			manifestDetails = generateManifestDetails(manifestFiles)
-			newDataKey = utilrand.String(5)
-			newDataValue = utilrand.String(5)
+			newDataKey = getWorkName(5)
+			newDataValue = getWorkName(5)
 
 			workObj := createWorkObj(
-				utilrand.String(5),
+				getWorkName(5),
 				defaultWorkNamespace,
 				manifestDetails,
 			)
@@ -314,7 +325,7 @@ var WorkUpdateWithReplacedManifestsContext = func(description string, originalMa
 			replacedManifestDetails = generateManifestDetails(replacedManifestFiles)
 
 			workObj := createWorkObj(
-				utilrand.String(5),
+				getWorkName(5),
 				defaultWorkNamespace,
 				originalManifestDetails,
 			)
@@ -392,7 +403,7 @@ var WorkDeletedContext = func(description string, manifestFiles []string) bool {
 			manifestDetails = generateManifestDetails(manifestFiles)
 
 			workObj := createWorkObj(
-				utilrand.String(5),
+				getWorkName(5),
 				defaultWorkNamespace,
 				manifestDetails,
 			)
@@ -438,13 +449,13 @@ var MultipleWorkWithSameManifestContext = func(description string, manifestFiles
 			manifestDetailsTwo = generateManifestDetails(manifestFiles)
 
 			workOne = createWorkObj(
-				utilrand.String(5),
+				getWorkName(5),
 				defaultWorkNamespace,
 				manifestDetailsOne,
 			)
 
 			workTwo = createWorkObj(
-				utilrand.String(5),
+				getWorkName(5),
 				defaultWorkNamespace,
 				manifestDetailsTwo)
 
@@ -605,3 +616,7 @@ func updateWork(work *workapi.Work) (*workapi.Work, error) {
 	}
 	return updatedWork, err
 }
+
+func getWorkName(length int) string {
+	return "work" + utilrand.String(length)
+}