PR comments

operator-framework · Jun 26, 2023 · acbbb7e · acbbb7e
1 parent fcdc4f5
commit acbbb7e
Showing 1 changed file with 23 additions and 13 deletions.
diff --git a/pkg/reconciler/reconciler_test.go b/pkg/reconciler/reconciler_test.go
@@ -688,17 +688,23 @@ var _ = Describe("Reconciler", func() {
 								obj.SetFinalizers([]string{uninstallFinalizer})
 								Expect(mgr.GetClient().Update(ctx, obj)).To(Succeed())
 								Expect(mgr.GetClient().Delete(ctx, obj)).To(Succeed())
+								Expect(mgr.GetClient().Get(ctx, objKey, obj)).To(Succeed())
+							})
+
+							By("expecting a conflict", func() {
+								result, err := r.Reconcile(ctx, req)
+								Expect(result).To(Equal(reconcile.Result{}))
+								Expect(apierrors.IsConflict(err)).To(BeTrue())
 							})
 
 							By("successfully reconciling a request", func() {
-								Eventually(func() bool {
-									result, err := r.Reconcile(ctx, req)
-									return result == reconcile.Result{} && err == nil
-								}).Should(BeTrue())
+								result, err := r.Reconcile(ctx, req)
+								Expect(result).To(Equal(reconcile.Result{}))
+								Expect(err).To(BeNil())
 							})
 
 							By("ensuring the finalizer is removed and the CR is deleted", func() {
-								err := mgr.GetAPIReader().Get(ctx, objKey, obj)
+								err := mgr.GetClient().Get(ctx, objKey, obj)
 								Expect(apierrors.IsNotFound(err)).To(BeTrue())
 							})
 						})
@@ -1199,10 +1205,9 @@ var _ = Describe("Reconciler", func() {
 								})
 
 								By("successfully reconciling a request", func() {
-									Eventually(func() bool {
-										result, err := r.Reconcile(ctx, req)
-										return result == reconcile.Result{} && err == nil
-									}).Should(BeTrue())
+									result, err := r.Reconcile(ctx, req)
+									Expect(result).To(Equal(reconcile.Result{}))
+									Expect(err).To(BeNil())
 								})
 
 								By("getting the release and CR", func() {
@@ -1298,11 +1303,16 @@ var _ = Describe("Reconciler", func() {
 									Expect(mgr.GetClient().Delete(ctx, obj)).To(Succeed())
 								})
 
+								By("expecting a reconciliation conflict", func() {
+									result, err := r.Reconcile(ctx, req)
+									Expect(result).To(Equal(reconcile.Result{}))
+									Expect(apierrors.IsConflict(err)).To(BeTrue())
+								})
+
 								By("successfully reconciling a request", func() {
-									Eventually(func() bool {
-										result, err := r.Reconcile(ctx, req)
-										return result == reconcile.Result{} && err == nil
-									}).Should(BeTrue())
+									result, err := r.Reconcile(ctx, req)
+									Expect(result).To(Equal(reconcile.Result{}))
+									Expect(err).To(BeNil())
 								})
 
 								By("verifying the release is uninstalled", func() {