Skip to content

Commit 3cdc00e

Browse files
committed
test(operator): gracefully stop test controller manager
Stop Operator unit test controller manager before stopping testenv to prevent moot error message spam in test output.
1 parent 93b8c3e commit 3cdc00e

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

pkg/controller/operators/suite_test.go

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,9 @@ var (
3838
cfg *rest.Config
3939
k8sClient client.Client
4040
testEnv *envtest.Environment
41-
scheme = runtime.NewScheme()
41+
stop chan struct{}
4242

43+
scheme = runtime.NewScheme()
4344
gracePeriod int64 = 0
4445
propagation = metav1.DeletePropagationForeground
4546
deleteOpts = &client.DeleteOptions{
@@ -96,7 +97,7 @@ var _ = BeforeSuite(func() {
9697
By("Adding the operator controller to the manager")
9798
Expect(reconciler.SetupWithManager(mgr)).ToNot(HaveOccurred())
9899

99-
stop := ctrl.SetupSignalHandler()
100+
stop = make(chan struct{})
100101
go func() {
101102
defer GinkgoRecover()
102103

@@ -112,6 +113,9 @@ var _ = BeforeSuite(func() {
112113
}, 60)
113114

114115
var _ = AfterSuite(func() {
116+
By("stopping the controller manager")
117+
close(stop)
118+
115119
By("tearing down the test environment")
116120
err := testEnv.Stop()
117121
Expect(err).ToNot(HaveOccurred())

0 commit comments

Comments
 (0)