Skip to content

Commit 67d4e32

Browse files
committed
Remove deprecated Ginkgo async testing
As described in https://github.com/onsi/ginkgo/blob/v2/docs/MIGRATING_TO_V2.md#removed-async-testing, Ginkgo implementation of asynchronous testing using a `Done` channel is removed. Instead of migrating, we make the test synchronous.
1 parent dc138cc commit 67d4e32

File tree

2 files changed

+4
-9
lines changed

2 files changed

+4
-9
lines changed

api/v1beta1/suite_test.go

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,7 @@ func TestAPIs(t *testing.T) {
3939
[]Reporter{printer.NewlineReporter{}})
4040
}
4141

42-
var _ = BeforeSuite(func(done Done) {
43-
42+
var _ = BeforeSuite(func() {
4443
logf.SetLogger(zap.New(zap.UseDevMode(true), zap.WriteTo(GinkgoWriter)))
4544

4645
By("bootstrapping test environment")
@@ -58,9 +57,7 @@ var _ = BeforeSuite(func(done Done) {
5857
k8sClient, err = client.New(cfg, client.Options{Scheme: scheme.Scheme})
5958
Expect(err).ToNot(HaveOccurred())
6059
Expect(k8sClient).ToNot(BeNil())
61-
62-
close(done)
63-
}, 60)
60+
})
6461

6562
var _ = AfterSuite(func() {
6663
By("tearing down the test environment")

controllers/suite_test.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ func TestControllers(t *testing.T) {
6161
[]Reporter{printer.NewlineReporter{}})
6262
}
6363

64-
var _ = BeforeSuite(func(done Done) {
64+
var _ = BeforeSuite(func() {
6565
logf.SetLogger(zap.New(zap.UseDevMode(true), zap.WriteTo(GinkgoWriter)))
6666

6767
By("bootstrapping test environment")
@@ -101,9 +101,7 @@ var _ = BeforeSuite(func(done Done) {
101101

102102
client = mgr.GetClient()
103103
Expect(client).ToNot(BeNil())
104-
105-
close(done)
106-
}, 60)
104+
})
107105

108106
var _ = AfterSuite(func() {
109107
By("tearing down the test environment")

0 commit comments

Comments
 (0)