fix e2e test order

Author: joelanford

test/e2e/operator_test.go

@@ -64,11 +64,11 @@ var _ = Describe("Operator", func() {
 	// 8. Ensure o's status.components.refs field eventually contains references to sa-a and sa-b
 	// 9. Remove the component label from sa-b
 	// 10. Ensure the reference to sa-b is eventually removed from o's status.components.refs field
-	// 11. Delete ns-a
-	// 12. Ensure the reference to ns-a is eventually removed from o's status.components.refs field
-	// 13. Delete o
-	// 14. Ensure o is re-created
-	// 15. Delete ns-b and o
+	// 11. Delete o
+	// 12. Ensure o is re-created
+	// 13. Delete ns-a
+	// 14. Ensure the reference to ns-a is eventually removed from o's status.components.refs field
+	// 15. Delete o
 	// 16. Ensure o is not re-created
 	It("should surface components in its status", func() {
 		o := &operatorsv1.Operator{}
@@ -188,19 +188,6 @@ var _ = Describe("Operator", func() {
 		By("removing a component's reference when it no longer bears the component label")
 		componentRefEventuallyExists(w, false, getReference(scheme, saB))
 
-		// Delete ns-a
-		Eventually(func() error {
-			err := client.Delete(clientCtx, nsA)
-			if apierrors.IsNotFound(err) {
-				return nil
-			}
-			return err
-		}).Should(Succeed())
-
-		// Ensure the reference to ns-a is eventually removed from o's status.components.refs field
-		By("removing a component's reference when it no longer exists")
-		componentRefEventuallyExists(w, false, getReference(scheme, nsA))
-
 		// Delete o
 		Eventually(func() error {
 			err := client.Delete(clientCtx, o)
@@ -216,23 +203,37 @@ var _ = Describe("Operator", func() {
 			return client.Get(clientCtx, types.NamespacedName{Name: o.GetName()}, o)
 		}).Should(Succeed())
 
-		// Delete ns-b and o
+		// Delete ns-a
 		Eventually(func() error {
-			if err := client.Delete(clientCtx, nsB); err != nil && !apierrors.IsNotFound(err) {
-				return err
+			err := client.Delete(clientCtx, nsA)
+			if apierrors.IsNotFound(err) {
+				return nil
 			}
-			if err := client.Delete(clientCtx, o); err != nil && !apierrors.IsNotFound(err) {
-				return err
+			return err
+		}).Should(Succeed())
+
+		// Ensure the reference to ns-a is eventually removed from o's status.components.refs field
+		By("removing a component's reference when it no longer exists")
+		componentRefEventuallyExists(w, false, getReference(scheme, nsA))
+
+		// Delete o
+		Eventually(func() error {
+			err := client.Delete(clientCtx, o)
+			if apierrors.IsNotFound(err) {
+				return nil
 			}
-			return nil
+			return err
 		}).Should(Succeed())
 
 		// Ensure that o is consistently not found
 		By("verifying the Operator is permanently deleted if it has no components")
-		Consistently(func() bool {
+		Consistently(func() error {
 			err := client.Get(clientCtx, types.NamespacedName{Name: o.GetName()}, o)
-			return apierrors.IsNotFound(err)
-		}).Should(BeTrue())
+			if apierrors.IsNotFound(err) {
+				return nil
+			}
+			return err
+		}).Should(Succeed())
 	})
 
 	Context("when a subscription to a package exists", func() {