recover e2e

Signed-off-by: yiraeChristineKim <[email protected]>

Author: yiraeChristineKim

test/e2e/case38_install_operator_test.go

@@ -24,7 +24,7 @@ import (
 	"open-cluster-management.io/config-policy-controller/test/utils"
 )
 
-var _ = Describe("Testing OperatorPolicy", Ordered, Label("supports-hosted"), func() {
+var _ = FDescribe("Testing OperatorPolicy", Ordered, Label("supports-hosted"), func() {
 	const (
 		opPolTestNS          = "operator-policy-testns"
 		parentPolicyYAML     = "../resources/case38_operator_install/parent-policy.yaml"
@@ -318,7 +318,7 @@ var _ = Describe("Testing OperatorPolicy", Ordered, Label("supports-hosted"), fu
 					Reason:  "PolicyValidated",
 					Message: `the policy spec is valid`,
 				},
-				`a relevant InstallPlan is actively installing`,
+				`the policy spec is valid`,
 			)
 		})
 	})
@@ -473,8 +473,7 @@ var _ = Describe("Testing OperatorPolicy", Ordered, Label("supports-hosted"), fu
 					Message: "the policy does not specify an OperatorGroup but one already exists in the namespace" +
 						" - assuming that OperatorGroup is correct",
 				},
-				// Still installPlan failed because the OperatorGroup is not correct
-				"a relevant InstallPlan is actively installing",
+				"assuming that OperatorGroup is correct",
 			)
 		})
 	})
@@ -588,8 +587,7 @@ var _ = Describe("Testing OperatorPolicy", Ordered, Label("supports-hosted"), fu
 					Reason:  "OperatorGroupMatches",
 					Message: "the OperatorGroup matches what is required by the policy",
 				},
-				// SubscriptionMissing blocks OperatorGroupMatches
-				"",
+				"the OperatorGroup matches what is required by the policy",
 			)
 		})
 		It("Should report a mismatch when the OperatorGroup is manually edited", func() {
@@ -719,8 +717,7 @@ var _ = Describe("Testing OperatorPolicy", Ordered, Label("supports-hosted"), fu
 					Reason:  "SubscriptionMissing",
 					Message: "the Subscription required by the policy was not found",
 				},
-				// OperatorGroupMismatch blocks SubscriptionMissing
-				"",
+				"the Subscription required by the policy was not found",
 			)
 		})
 		It("Should not create the Subscription when another OperatorGroup already exists", func() {
@@ -780,7 +777,7 @@ var _ = Describe("Testing OperatorPolicy", Ordered, Label("supports-hosted"), fu
 					Reason:  "SubscriptionMissing",
 					Message: "the Subscription required by the policy was not found",
 				},
-				"the OperatorGroup found on the cluster does not match the policy",
+				"the Subscription required by the policy was not found",
 			)
 		})
 
@@ -834,7 +831,7 @@ var _ = Describe("Testing OperatorPolicy", Ordered, Label("supports-hosted"), fu
 					Reason:  "ConstraintsNotSatisfiable",
 					Message: "constraints not satisfiable: refer to the Subscription for more details",
 				},
-				"constraints not satisfiable: refer to the Subscription for more details",
+				"the Subscription was updated to match the policy",
 			)
 		})
 	})
@@ -876,8 +873,7 @@ var _ = Describe("Testing OperatorPolicy", Ordered, Label("supports-hosted"), fu
 					Reason:  "SubscriptionMatches",
 					Message: "the Subscription matches what is required by the policy",
 				},
-				// OperatorGroupMissing blocks SubscriptionMatches
-				"",
+				"the Subscription matches what is required by the policy",
 			)
 		})
 		It("Should notice the mismatch when the spec is changed in the policy", func() {
@@ -904,7 +900,7 @@ var _ = Describe("Testing OperatorPolicy", Ordered, Label("supports-hosted"), fu
 					Reason:  "SubscriptionMismatch",
 					Message: "the Subscription found on the cluster does not match the policy",
 				},
-				"the OperatorGroup required by the policy was not found",
+				"the Subscription found on the cluster does not match the policy",
 			)
 		})
 	})
@@ -1092,9 +1088,7 @@ var _ = Describe("Testing OperatorPolicy", Ordered, Label("supports-hosted"), fu
 					Reason:  "NoExistingDeployments",
 					Message: "no existing operator Deployments",
 				},
-				// ClusterServiceVersionCompliant UnsupportedOperatorGroup blocks
-				// "no existing operator Deployments"
-				"",
+				"no existing operator Deployments",
 			)
 		})
 
@@ -1151,8 +1145,7 @@ var _ = Describe("Testing OperatorPolicy", Ordered, Label("supports-hosted"), fu
 					Reason:  "CatalogSourcesFound",
 					Message: "CatalogSource was found",
 				},
-				// OperatorGroupMissing blocks CatalogSourcesFound
-				"",
+				"CatalogSource was found",
 			)
 		})
 		It("Should remain compliant when policy is enforced", func() {
@@ -1211,8 +1204,7 @@ var _ = Describe("Testing OperatorPolicy", Ordered, Label("supports-hosted"), fu
 					Reason:  "CatalogSourcesNotFound",
 					Message: "CatalogSource 'fakeName' was not found",
 				},
-				// SubscriptionCompliant ConstraintsNotSatisfiable blocks CatalogSourcesNotFound
-				"",
+				"CatalogSource 'fakeName' was not found",
 			)
 		})
 		It("Should report unhealthy status when CatalogSource fails", func() {
@@ -1246,8 +1238,7 @@ var _ = Describe("Testing OperatorPolicy", Ordered, Label("supports-hosted"), fu
 					Reason:  "CatalogSourcesFoundUnhealthy",
 					Message: "CatalogSource was found but is unhealthy",
 				},
-				// CatalogSourceUnhealthy event is not created because of ClusterServiceVersion error
-				"",
+				"CatalogSource was found but is unhealthy",
 			)
 		})
 		It("Should become NonCompliant when ComplianceConfig is modified", func() {
@@ -1277,8 +1268,7 @@ var _ = Describe("Testing OperatorPolicy", Ordered, Label("supports-hosted"), fu
 					Reason:  "CatalogSourcesFoundUnhealthy",
 					Message: "CatalogSource was found but is unhealthy",
 				},
-				// CatalogSourceUnhealthy event is not created because of ClusterServiceVersion error
-				"",
+				"CatalogSource was found but is unhealthy",
 			)
 		})
 	})
@@ -1372,9 +1362,7 @@ var _ = Describe("Testing OperatorPolicy", Ordered, Label("supports-hosted"), fu
 					Reason:  "NoInstallPlansFound",
 					Message: "there are no relevant InstallPlans in the namespace",
 				},
-				// Due to SubscriptionCompliant error "NonCompliant;
-				// the InstallPlan event will not be created.
-				"",
+				"there are no relevant InstallPlans in the namespace",
 			)
 		})
 		It("Should report an available install when informing", func(ctx SpecContext) {
@@ -1602,8 +1590,7 @@ var _ = Describe("Testing OperatorPolicy", Ordered, Label("supports-hosted"), fu
 					Reason:  "RelevantCRDNotFound",
 					Message: "no CRDs were found for the operator",
 				},
-				// "the OperatorGroup required by the policy was not found" blocks this message from being emitted
-				"",
+				"no CRDs were found for the operator",
 			)
 		})
 
@@ -1770,9 +1757,7 @@ var _ = Describe("Testing OperatorPolicy", Ordered, Label("supports-hosted"), fu
 					Reason:  "InvalidPolicySpec",
 					Message: `spec.operatorGroup is invalid: json: unknown field "foo"`,
 				},
-				// ValidPolicySpec blocks OperatorGroupCompliant "the status of the OperatorGroup
-				// could not be determined because the policy is invalid"
-				"",
+				`spec.operatorGroup is invalid: json: unknown field "foo"`,
 			)
 			check(
 				opPolName,
@@ -1817,9 +1802,7 @@ var _ = Describe("Testing OperatorPolicy", Ordered, Label("supports-hosted"), fu
 			)
 		})
 		It("Should update the status after the namespace is created", func() {
-			// Create the nonexist-testns namespace
 			KubectlTarget("create", "namespace", "nonexist-testns")
-
 			check(
 				opPolName,
 				true,
@@ -1841,7 +1824,7 @@ var _ = Describe("Testing OperatorPolicy", Ordered, Label("supports-hosted"), fu
 					Reason:  "PolicyValidated",
 					Message: "the policy spec is valid",
 				},
-				"",
+				"the policy spec is valid",
 			)
 		})
 	})
@@ -2069,8 +2052,7 @@ var _ = Describe("Testing OperatorPolicy", Ordered, Label("supports-hosted"), fu
 					Reason:  "SubscriptionPresent",
 					Message: "the Subscription is present",
 				},
-				// OperatorGroup Present blocks Subscription Present
-				"",
+				`the Subscription is present`,
 			)
 			check(
 				opPolName,
@@ -2092,8 +2074,7 @@ var _ = Describe("Testing OperatorPolicy", Ordered, Label("supports-hosted"), fu
 					Reason:  "InstallPlanNotApplicable",
 					Message: "MustNotHave policies ignore kind InstallPlan",
 				},
-				// OperatorGroup Present blocks Subscription Present
-				"",
+				`MustNotHave policies ignore kind InstallPlan`,
 			)
 			check(
 				opPolName,
@@ -2115,8 +2096,7 @@ var _ = Describe("Testing OperatorPolicy", Ordered, Label("supports-hosted"), fu
 					Reason:  "ClusterServiceVersionPresent",
 					Message: "the ClusterServiceVersion (quay-operator.v3.10.0) is present",
 				},
-				// OperatorGroup Present blocks
-				"",
+				regexp.QuoteMeta("the ClusterServiceVersion (quay-operator.v3.10.0) is present"),
 			)
 			check(
 				opPolName,
@@ -2138,8 +2118,7 @@ var _ = Describe("Testing OperatorPolicy", Ordered, Label("supports-hosted"), fu
 					Reason:  "CustomResourceDefinitionPresent",
 					Message: "the CustomResourceDefinition is present",
 				},
-				// OperatorGroup Present blocks
-				"",
+				`the CustomResourceDefinition is present`,
 			)
 			check(
 				opPolName,
@@ -2162,8 +2141,7 @@ var _ = Describe("Testing OperatorPolicy", Ordered, Label("supports-hosted"), fu
 					Reason:  "DeploymentNotApplicable",
 					Message: "MustNotHave policies ignore kind Deployment",
 				},
-				// OperatorGroup Present blocks
-				"",
+				`MustNotHave policies ignore kind Deployment`,
 			)
 			check(
 				opPolName,
@@ -2186,8 +2164,7 @@ var _ = Describe("Testing OperatorPolicy", Ordered, Label("supports-hosted"), fu
 					Reason:  "CatalogSourceNotApplicable",
 					Message: "MustNotHave policies ignore kind CatalogSource",
 				},
-				// OperatorGroup Present blocks
-				"",
+				`MustNotHave policies ignore kind CatalogSource`,
 			)
 		})