Skip to content

Commit d36d011

Browse files
committed
Removed the source queue and pulled object from the channel
1 parent 531af49 commit d36d011

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

events/suite_test.go

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ var (
3939
var ctx context.Context
4040
var fakeClock *clock.FakeClock
4141
var controller *events.Controller[*test.CustomObject]
42+
var environment envtest.Environment
4243
var kubeClient client.Client
4344

4445
func Test(t *testing.T) {
@@ -51,13 +52,17 @@ var _ = BeforeSuite(func() {
5152
ctx = log.IntoContext(context.Background(), ginkgo.GinkgoLogr)
5253

5354
fakeClock = clock.NewFakeClock(time.Now())
54-
environment := envtest.Environment{Scheme: scheme.Scheme}
55+
environment = envtest.Environment{Scheme: scheme.Scheme}
5556
_ = lo.Must(environment.Start())
5657
kubeClient = lo.Must(client.New(environment.Config, client.Options{Scheme: scheme.Scheme}))
5758

5859
controller = events.NewController[*test.CustomObject](ctx, kubeClient, fakeClock, kubernetes.NewForConfigOrDie(environment.Config))
5960
})
6061

62+
var _ = AfterSuite(func() {
63+
environment.Stop()
64+
})
65+
6166
var _ = Describe("Controller", func() {
6267
BeforeEach(func() {
6368
controller.EventCount.Reset()
@@ -74,7 +79,7 @@ var _ = Describe("Controller", func() {
7479
Expect(GetMetric("operator_customobject_event_total", conditionLabels(fmt.Sprintf("Test-type-%d", i), fmt.Sprintf("Test-reason-%d", i)))).To(BeNil())
7580

7681
// reconcile on the event
77-
_, err := singleton.AsReconciler(controller).Reconcile(ctx, reconcile.Request{NamespacedName: client.ObjectKeyFromObject(events[i])})
82+
_, err := singleton.AsChannelObjectReconciler(controller.EventWatch.ResultChan(), controller).Reconcile(ctx, reconcile.Request{})
7883
Expect(err).ToNot(HaveOccurred())
7984

8085
// expect an emitted metric to for the event
@@ -91,7 +96,7 @@ var _ = Describe("Controller", func() {
9196
Expect(GetMetric("operator_ustomobject_event_total", conditionLabels(corev1.EventTypeNormal, "reason"))).To(BeNil())
9297

9398
// reconcile on the event
94-
_, err := singleton.AsReconciler(controller).Reconcile(ctx, reconcile.Request{NamespacedName: client.ObjectKeyFromObject(event)})
99+
_, err := singleton.AsChannelObjectReconciler(controller.EventWatch.ResultChan(), controller).Reconcile(ctx, reconcile.Request{NamespacedName: client.ObjectKeyFromObject(event)})
95100
Expect(err).ToNot(HaveOccurred())
96101

97102
// expect not have an emitted metric to for the event
@@ -102,7 +107,7 @@ var _ = Describe("Controller", func() {
102107
ExpectApplied(ctx, kubeClient, event)
103108

104109
// reconcile on the event
105-
_, err = singleton.AsReconciler(controller).Reconcile(ctx, reconcile.Request{NamespacedName: client.ObjectKeyFromObject(event)})
110+
_, err = singleton.AsChannelObjectReconciler(controller.EventWatch.ResultChan(), controller).Reconcile(ctx, reconcile.Request{NamespacedName: client.ObjectKeyFromObject(event)})
106111
Expect(err).ToNot(HaveOccurred())
107112

108113
// expect an emitted metric to for the event

0 commit comments

Comments
 (0)