Skip to content

Commit 2c3a6fa

Browse files
schrejacumino
schrej
and
acumino
authored
⚠ Migrate to ginkgo v2 (#1977)
* Upgrade to ginkgo v2.1.1 * Adapt ginkgo import paths * Drop obsolete table extension imports * Remove {Before,After} Suite specific timeout * Remove It specific timeout * Adapt custom reporter to changed reporting infrastructure This is only a temporary adaption, as we are using the temporary compatibility layer, which will be removed again soon. Hence, we have to rework this and adapt for the long-term. * Update dependency * Address PR Review * Adpat custom reporter chnages * Minor edit * Rebase * switch tools/setup-envtest to ginkgo v2 * remove prow ginkgo helper * add junit output for ginkgo based tests * remove suitName constants Co-authored-by: acumino <[email protected]>
1 parent d242fe2 commit 2c3a6fa

File tree

123 files changed

+292
-526
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

123 files changed

+292
-526
lines changed

‎.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,6 @@
2222

2323
# Tools binaries.
2424
hack/tools/bin
25+
26+
junit-report.xml
27+
/artifacts

‎example_test.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@ import (
2626
corev1 "k8s.io/api/core/v1"
2727
ctrl "sigs.k8s.io/controller-runtime"
2828
"sigs.k8s.io/controller-runtime/pkg/client"
29+
30+
// since we invoke tests with -ginkgo.junit-report we need to import ginkgo.
31+
_ "github.com/onsi/ginkgo/v2"
2932
)
3033

3134
// This example creates a simple application Controller that is configured for ReplicaSets and Pods.

‎go.mod

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ require (
88
github.com/go-logr/logr v1.2.3
99
github.com/go-logr/zapr v1.2.3
1010
github.com/google/go-cmp v0.5.8
11-
github.com/onsi/ginkgo v1.16.5
11+
github.com/onsi/ginkgo/v2 v2.1.4
1212
github.com/onsi/gomega v1.19.0
1313
github.com/prometheus/client_golang v1.12.2
1414
github.com/prometheus/client_model v0.2.0
@@ -53,7 +53,6 @@ require (
5353
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
5454
github.com/modern-go/reflect2 v1.0.2 // indirect
5555
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
56-
github.com/nxadm/tail v1.4.8 // indirect
5756
github.com/pkg/errors v0.9.1 // indirect
5857
github.com/prometheus/common v0.32.1 // indirect
5958
github.com/prometheus/procfs v0.7.3 // indirect
@@ -67,7 +66,6 @@ require (
6766
google.golang.org/appengine v1.6.7 // indirect
6867
google.golang.org/protobuf v1.28.0 // indirect
6968
gopkg.in/inf.v0 v0.9.1 // indirect
70-
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
7169
gopkg.in/yaml.v2 v2.4.0 // indirect
7270
gopkg.in/yaml.v3 v3.0.1 // indirect
7371
k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // indirect

‎go.sum

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -378,14 +378,12 @@ github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+
378378
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
379379
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
380380
github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
381-
github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
382381
github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
383382
github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
384383
github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
385384
github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
385+
github.com/onsi/ginkgo v1.16.4 h1:29JGrr5oVBm5ulCWet69zQkzWipVXIol6ygQUe/EzNc=
386386
github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0=
387-
github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
388-
github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
389387
github.com/onsi/ginkgo/v2 v2.1.3/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c=
390388
github.com/onsi/ginkgo/v2 v2.1.4 h1:GNapqRSid3zijZ9H77KrgVG4/8KqiyRsxcSxe+7ApXY=
391389
github.com/onsi/ginkgo/v2 v2.1.4/go.mod h1:um6tUpWM/cxCK3/FK8BXqEiUMUwRgSM4JXG47RKZmLU=
@@ -973,7 +971,6 @@ gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
973971
gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k=
974972
gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo=
975973
gopkg.in/square/go-jose.v2 v2.2.2/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=
976-
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
977974
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
978975
gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74=
979976
gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

‎hack/test-all.sh

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,21 @@ source $(dirname ${BASH_SOURCE})/common.sh
2020

2121
header_text "running go test"
2222

23-
go test -race ${P_FLAG} ${MOD_OPT} ./...
23+
if [[ -n ${ARTIFACTS:-} ]]; then
24+
GINKGO_ARGS="-ginkgo.junit-report=junit-report.xml"
25+
fi
26+
27+
result=0
28+
go test -race ${P_FLAG} ${MOD_OPT} ./... ${GINKGO_ARGS} || result=$?
2429

2530
if [[ -n ${ARTIFACTS:-} ]]; then
26-
if grep -Rin '<failure type="Failure">' ${ARTIFACTS}/*; then exit 1; fi
31+
mkdir -p ${ARTIFACTS}
32+
for file in `find . -name *junit-report.xml`; do
33+
new_file=${file#./}
34+
new_file=${new_file%/junit-report.xml}
35+
new_file=${new_file//"/"/"-"}
36+
mv "$file" "$ARTIFACTS/junit_${new_file}.xml"
37+
done
2738
fi
39+
40+
exit $result

‎pkg/builder/builder_suite_test.go

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package builder
1919
import (
2020
"testing"
2121

22-
. "github.com/onsi/ginkgo"
22+
. "github.com/onsi/ginkgo/v2"
2323
. "github.com/onsi/gomega"
2424
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
2525
"k8s.io/apimachinery/pkg/api/meta"
@@ -28,7 +28,6 @@ import (
2828
"k8s.io/client-go/rest"
2929

3030
"sigs.k8s.io/controller-runtime/pkg/envtest"
31-
"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
3231
"sigs.k8s.io/controller-runtime/pkg/internal/testing/addr"
3332
logf "sigs.k8s.io/controller-runtime/pkg/log"
3433
"sigs.k8s.io/controller-runtime/pkg/log/zap"
@@ -38,8 +37,7 @@ import (
3837

3938
func TestBuilder(t *testing.T) {
4039
RegisterFailHandler(Fail)
41-
suiteName := "application Suite"
42-
RunSpecsWithDefaultAndCustomReporters(t, suiteName, []Reporter{printer.NewlineReporter{}, printer.NewProwReporter(suiteName)})
40+
RunSpecs(t, "application Suite")
4341
}
4442

4543
var testenv *envtest.Environment
@@ -63,7 +61,7 @@ var _ = BeforeSuite(func() {
6361

6462
webhook.DefaultPort, _, err = addr.Suggest("")
6563
Expect(err).NotTo(HaveOccurred())
66-
}, 60)
64+
})
6765

6866
var _ = AfterSuite(func() {
6967
Expect(testenv.Stop()).To(Succeed())

‎pkg/builder/controller_test.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
"sync/atomic"
2424

2525
"github.com/go-logr/logr"
26-
. "github.com/onsi/ginkgo"
26+
. "github.com/onsi/ginkgo/v2"
2727
. "github.com/onsi/gomega"
2828
appsv1 "k8s.io/api/apps/v1"
2929
corev1 "k8s.io/api/core/v1"
@@ -321,7 +321,7 @@ var _ = Describe("application", func() {
321321
ctx, cancel := context.WithCancel(context.Background())
322322
defer cancel()
323323
doReconcileTest(ctx, "3", m, false, bldr)
324-
}, 10)
324+
})
325325

326326
It("should Reconcile Watches objects", func() {
327327
m, err := manager.New(cfg, manager.Options{})
@@ -336,7 +336,7 @@ var _ = Describe("application", func() {
336336
ctx, cancel := context.WithCancel(context.Background())
337337
defer cancel()
338338
doReconcileTest(ctx, "4", m, true, bldr)
339-
}, 10)
339+
})
340340
})
341341

342342
Describe("Set custom predicates", func() {
@@ -552,7 +552,6 @@ func doReconcileTest(ctx context.Context, nameSuffix string, mgr manager.Manager
552552
go func() {
553553
defer GinkgoRecover()
554554
Expect(mgr.Start(ctx)).NotTo(HaveOccurred())
555-
By("Stopping the application")
556555
}()
557556

558557
By("Creating a Deployment")

‎pkg/builder/webhook_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import (
2525
"os"
2626
"strings"
2727

28-
. "github.com/onsi/ginkgo"
28+
. "github.com/onsi/ginkgo/v2"
2929
. "github.com/onsi/gomega"
3030
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3131
"k8s.io/apimachinery/pkg/runtime"

‎pkg/cache/cache_suite_test.go

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,20 +19,18 @@ package cache_test
1919
import (
2020
"testing"
2121

22-
. "github.com/onsi/ginkgo"
22+
. "github.com/onsi/ginkgo/v2"
2323
. "github.com/onsi/gomega"
2424
"k8s.io/client-go/kubernetes"
2525
"k8s.io/client-go/rest"
2626
"sigs.k8s.io/controller-runtime/pkg/envtest"
27-
"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
2827
logf "sigs.k8s.io/controller-runtime/pkg/log"
2928
"sigs.k8s.io/controller-runtime/pkg/log/zap"
3029
)
3130

3231
func TestSource(t *testing.T) {
3332
RegisterFailHandler(Fail)
34-
suiteName := "Cache Suite"
35-
RunSpecsWithDefaultAndCustomReporters(t, suiteName, []Reporter{printer.NewlineReporter{}, printer.NewProwReporter(suiteName)})
33+
RunSpecs(t, "Cache Suite")
3634
}
3735

3836
var testenv *envtest.Environment
@@ -50,7 +48,7 @@ var _ = BeforeSuite(func() {
5048

5149
clientset, err = kubernetes.NewForConfig(cfg)
5250
Expect(err).NotTo(HaveOccurred())
53-
}, 60)
51+
})
5452

5553
var _ = AfterSuite(func() {
5654
Expect(testenv.Stop()).To(Succeed())

‎pkg/cache/cache_test.go

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@ import (
2323
"sort"
2424
"strconv"
2525

26-
. "github.com/onsi/ginkgo"
27-
. "github.com/onsi/ginkgo/extensions/table"
26+
. "github.com/onsi/ginkgo/v2"
2827
. "github.com/onsi/gomega"
2928

3029
corev1 "k8s.io/api/core/v1"
@@ -1540,7 +1539,7 @@ func CacheTest(createCacheFunc func(config *rest.Config, opts cache.Options) (ca
15401539

15411540
By("verifying the object is received on the channel")
15421541
Eventually(out).Should(Receive(Equal(pod)))
1543-
}, 3)
1542+
})
15441543

15451544
It("should be able to index an object field then retrieve objects by that field", func() {
15461545
By("creating the cache")
@@ -1590,7 +1589,7 @@ func CacheTest(createCacheFunc func(config *rest.Config, opts cache.Options) (ca
15901589
Expect(listObj.Items).Should(HaveLen(1))
15911590
actual := listObj.Items[0]
15921591
Expect(actual.GetName()).To(Equal("test-pod-3"))
1593-
}, 3)
1592+
})
15941593

15951594
It("should allow for get informer to be cancelled", func() {
15961595
By("cancelling the context")
@@ -1660,7 +1659,7 @@ func CacheTest(createCacheFunc func(config *rest.Config, opts cache.Options) (ca
16601659

16611660
By("verifying the object's metadata is received on the channel")
16621661
Eventually(out).Should(Receive(Equal(podMeta)))
1663-
}, 3)
1662+
})
16641663

16651664
It("should be able to index an object field then retrieve objects by that field", func() {
16661665
By("creating the cache")
@@ -1714,7 +1713,7 @@ func CacheTest(createCacheFunc func(config *rest.Config, opts cache.Options) (ca
17141713
Version: "v1",
17151714
Kind: "Pod",
17161715
}))
1717-
}, 3)
1716+
})
17181717

17191718
It("should allow for get informer to be cancelled", func() {
17201719
By("creating a context and cancelling it")

‎pkg/cache/informer_cache_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ limitations under the License.
1717
package cache_test
1818

1919
import (
20-
. "github.com/onsi/ginkgo"
20+
. "github.com/onsi/ginkgo/v2"
2121
. "github.com/onsi/gomega"
2222

2323
"k8s.io/client-go/rest"

‎pkg/cache/informer_cache_unit_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ limitations under the License.
1717
package cache
1818

1919
import (
20-
. "github.com/onsi/ginkgo"
20+
. "github.com/onsi/ginkgo/v2"
2121
. "github.com/onsi/gomega"
2222

2323
corev1 "k8s.io/api/core/v1"

‎pkg/cache/internal/informers_map_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package internal
1919
import (
2020
"fmt"
2121

22-
. "github.com/onsi/ginkgo"
22+
. "github.com/onsi/ginkgo/v2"
2323
. "github.com/onsi/gomega"
2424
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2525
"k8s.io/apimachinery/pkg/runtime"

‎pkg/cache/internal/internal_suite_test.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,11 @@ package internal
1919
import (
2020
"testing"
2121

22-
. "github.com/onsi/ginkgo"
22+
. "github.com/onsi/ginkgo/v2"
2323
. "github.com/onsi/gomega"
24-
"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
2524
)
2625

2726
func TestSource(t *testing.T) {
2827
RegisterFailHandler(Fail)
29-
suiteName := "Cache Internal Suite"
30-
RunSpecsWithDefaultAndCustomReporters(t, suiteName, []Reporter{printer.NewlineReporter{}, printer.NewProwReporter(suiteName)})
28+
RunSpecs(t, "Cache Internal Suite")
3129
}

‎pkg/certwatcher/certwatcher_suite_test.go

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,8 @@ import (
2020
"os"
2121
"testing"
2222

23-
. "github.com/onsi/ginkgo"
23+
. "github.com/onsi/ginkgo/v2"
2424
. "github.com/onsi/gomega"
25-
"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
2625
logf "sigs.k8s.io/controller-runtime/pkg/log"
2726
"sigs.k8s.io/controller-runtime/pkg/log/zap"
2827
)
@@ -34,16 +33,15 @@ var (
3433

3534
func TestSource(t *testing.T) {
3635
RegisterFailHandler(Fail)
37-
suiteName := "CertWatcher Suite"
38-
RunSpecsWithDefaultAndCustomReporters(t, suiteName, []Reporter{printer.NewlineReporter{}, printer.NewProwReporter(suiteName)})
36+
RunSpecs(t, "CertWatcher Suite")
3937
}
4038

4139
var _ = BeforeSuite(func() {
4240
logf.SetLogger(zap.New(zap.WriteTo(GinkgoWriter), zap.UseDevMode(true)))
43-
}, 60)
41+
})
4442

4543
var _ = AfterSuite(func() {
4644
for _, file := range []string{certPath, keyPath} {
4745
_ = os.Remove(file)
4846
}
49-
}, 60)
47+
})

‎pkg/certwatcher/certwatcher_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import (
2929
"os"
3030
"time"
3131

32-
. "github.com/onsi/ginkgo"
32+
. "github.com/onsi/ginkgo/v2"
3333
. "github.com/onsi/gomega"
3434
"github.com/prometheus/client_golang/prometheus/testutil"
3535
"sigs.k8s.io/controller-runtime/pkg/certwatcher"

‎pkg/client/apiutil/apiutil_suite_test.go

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,17 @@ package apiutil
1919
import (
2020
"testing"
2121

22-
. "github.com/onsi/ginkgo"
22+
. "github.com/onsi/ginkgo/v2"
2323
. "github.com/onsi/gomega"
2424
"k8s.io/client-go/rest"
25-
"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
2625

2726
logf "sigs.k8s.io/controller-runtime/pkg/log"
2827
"sigs.k8s.io/controller-runtime/pkg/log/zap"
2928
)
3029

3130
func TestSource(t *testing.T) {
3231
RegisterFailHandler(Fail)
33-
suiteName := "API Utilities Test Suite"
34-
RunSpecsWithDefaultAndCustomReporters(t, suiteName, []Reporter{printer.NewlineReporter{}, printer.NewProwReporter(suiteName)})
32+
RunSpecs(t, "API Utilities Test Suite")
3533
}
3634

3735
var cfg *rest.Config
@@ -41,4 +39,4 @@ var _ = BeforeSuite(func() {
4139

4240
// for things that technically need a rest.Config for defaulting, but don't actually use them
4341
cfg = &rest.Config{}
44-
}, 60)
42+
})

‎pkg/client/apiutil/dynamicrestmapper_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"fmt"
2121
"time"
2222

23-
. "github.com/onsi/ginkgo"
23+
. "github.com/onsi/ginkgo/v2"
2424
. "github.com/onsi/gomega"
2525
"github.com/onsi/gomega/format"
2626
"github.com/onsi/gomega/types"

0 commit comments

Comments
 (0)