Skip to content

Commit beb43d9

Browse files
acuminoacumino
committed
Adpat custom reporter chnages
1 parent af8151f commit beb43d9

Some content is hidden

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

41 files changed

+44
-255
lines changed

‎go.sum

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -354,15 +354,13 @@ github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9k
354354
github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0=
355355
github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
356356
github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
357-
github.com/onsi/ginkgo/v2 v2.0.0/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c=
358357
github.com/onsi/ginkgo/v2 v2.1.1 h1:LCnPB85AvFNr91s0B2aDzEiiIg6MUwLYbryC1NSlWi8=
359358
github.com/onsi/ginkgo/v2 v2.1.1/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c=
360359
github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
361360
github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
362361
github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
362+
github.com/onsi/gomega v1.17.0 h1:9Luw4uT5HTjHTN8+aNcSThgH1vdXnmdJ8xIfZ4wyTRE=
363363
github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY=
364-
github.com/onsi/gomega v1.18.0 h1:ngbYoRctxjl8SiF7XgP0NxBFbfHcg3wfHMMaFHWwMTM=
365-
github.com/onsi/gomega v1.18.0/go.mod h1:0q+aL8jAiMXy9hbwj2mr5GziHiwhAIQpFmmtT5hitRs=
366364
github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
367365
github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
368366
github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=

‎pkg/builder/builder_suite_test.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import (
2020
"testing"
2121

2222
. "github.com/onsi/ginkgo/v2"
23-
"github.com/onsi/ginkgo/v2/reporters"
2423
. "github.com/onsi/gomega"
2524
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
2625
"k8s.io/apimachinery/pkg/api/meta"
@@ -78,8 +77,7 @@ var _ = AfterSuite(func() {
7877
})
7978

8079
var _ = ReportAfterSuite("Report to Prow", func(report Report) {
81-
reporters.ReportViaDeprecatedReporter(printer.NewlineReporter{}, report) //nolint // For migration of custom reporter check https://onsi.github.io/ginkgo/MIGRATING_TO_V2#migration-strategy-2
82-
reporters.ReportViaDeprecatedReporter(printer.NewProwReporter(suiteName), report) //nolint // For migration of custom reporter check https://onsi.github.io/ginkgo/MIGRATING_TO_V2#migration-strategy-2
80+
printer.AddReport(report, suiteName)
8381
})
8482

8583
func addCRDToEnvironment(env *envtest.Environment, gvks ...schema.GroupVersionKind) {

‎pkg/builder/controller_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -550,7 +550,6 @@ func doReconcileTest(ctx context.Context, nameSuffix string, mgr manager.Manager
550550
go func() {
551551
defer GinkgoRecover()
552552
Expect(mgr.Start(ctx)).NotTo(HaveOccurred())
553-
By("Stopping the application")
554553
}()
555554

556555
By("Creating a Deployment")

‎pkg/cache/cache_suite_test.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import (
2020
"testing"
2121

2222
. "github.com/onsi/ginkgo/v2"
23-
"github.com/onsi/ginkgo/v2/reporters"
2423
. "github.com/onsi/gomega"
2524
"k8s.io/client-go/kubernetes"
2625
"k8s.io/client-go/rest"
@@ -59,6 +58,5 @@ var _ = AfterSuite(func() {
5958
})
6059

6160
var _ = ReportAfterSuite("Report to Prow", func(report Report) {
62-
reporters.ReportViaDeprecatedReporter(printer.NewlineReporter{}, report) //nolint // For migration of custom reporter check https://onsi.github.io/ginkgo/MIGRATING_TO_V2#migration-strategy-2
63-
reporters.ReportViaDeprecatedReporter(printer.NewProwReporter(suiteName), report) //nolint // For migration of custom reporter check https://onsi.github.io/ginkgo/MIGRATING_TO_V2#migration-strategy-2
61+
printer.AddReport(report, suiteName)
6462
})

‎pkg/cache/internal/internal_suite_test.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import (
2020
"testing"
2121

2222
. "github.com/onsi/ginkgo/v2"
23-
"github.com/onsi/ginkgo/v2/reporters"
2423
. "github.com/onsi/gomega"
2524
"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
2625
)
@@ -33,6 +32,5 @@ func TestSource(t *testing.T) {
3332
}
3433

3534
var _ = ReportAfterSuite("Report to Prow", func(report Report) {
36-
reporters.ReportViaDeprecatedReporter(printer.NewlineReporter{}, report) //nolint // For migration of custom reporter check https://onsi.github.io/ginkgo/MIGRATING_TO_V2#migration-strategy-2
37-
reporters.ReportViaDeprecatedReporter(printer.NewProwReporter(suiteName), report) //nolint // For migration of custom reporter check https://onsi.github.io/ginkgo/MIGRATING_TO_V2#migration-strategy-2
35+
printer.AddReport(report, suiteName)
3836
})

‎pkg/certwatcher/certwatcher_suite_test.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import (
2121
"testing"
2222

2323
. "github.com/onsi/ginkgo/v2"
24-
"github.com/onsi/ginkgo/v2/reporters"
2524
. "github.com/onsi/gomega"
2625
"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
2726
logf "sigs.k8s.io/controller-runtime/pkg/log"
@@ -50,6 +49,5 @@ var _ = AfterSuite(func() {
5049
})
5150

5251
var _ = ReportAfterSuite("Report to Prow", func(report Report) {
53-
reporters.ReportViaDeprecatedReporter(printer.NewlineReporter{}, report) //nolint // For migration of custom reporter check https://onsi.github.io/ginkgo/MIGRATING_TO_V2#migration-strategy-2
54-
reporters.ReportViaDeprecatedReporter(printer.NewProwReporter(suiteName), report) //nolint // For migration of custom reporter check https://onsi.github.io/ginkgo/MIGRATING_TO_V2#migration-strategy-2
52+
printer.AddReport(report, suiteName)
5553
})

‎pkg/client/apiutil/apiutil_suite_test.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import (
2020
"testing"
2121

2222
. "github.com/onsi/ginkgo/v2"
23-
"github.com/onsi/ginkgo/v2/reporters"
2423
. "github.com/onsi/gomega"
2524
"k8s.io/client-go/rest"
2625
"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
@@ -46,6 +45,5 @@ var _ = BeforeSuite(func() {
4645
})
4746

4847
var _ = ReportAfterSuite("Report to Prow", func(report Report) {
49-
reporters.ReportViaDeprecatedReporter(printer.NewlineReporter{}, report) //nolint // For migration of custom reporter check https://onsi.github.io/ginkgo/MIGRATING_TO_V2#migration-strategy-2
50-
reporters.ReportViaDeprecatedReporter(printer.NewProwReporter(suiteName), report) //nolint // For migration of custom reporter check https://onsi.github.io/ginkgo/MIGRATING_TO_V2#migration-strategy-2
48+
printer.AddReport(report, suiteName)
5149
})

‎pkg/client/client_suite_test.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import (
2020
"testing"
2121

2222
. "github.com/onsi/ginkgo/v2"
23-
"github.com/onsi/ginkgo/v2/reporters"
2423
. "github.com/onsi/gomega"
2524
"k8s.io/client-go/kubernetes"
2625
"k8s.io/client-go/kubernetes/scheme"
@@ -64,6 +63,5 @@ var _ = AfterSuite(func() {
6463
})
6564

6665
var _ = ReportAfterSuite("Report to Prow", func(report Report) {
67-
reporters.ReportViaDeprecatedReporter(printer.NewlineReporter{}, report) //nolint // For migration of custom reporter check https://onsi.github.io/ginkgo/MIGRATING_TO_V2#migration-strategy-2
68-
reporters.ReportViaDeprecatedReporter(printer.NewProwReporter(suiteName), report) //nolint // For migration of custom reporter check https://onsi.github.io/ginkgo/MIGRATING_TO_V2#migration-strategy-2
66+
printer.AddReport(report, suiteName)
6967
})

‎pkg/client/config/config_suite_test.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import (
2020
"testing"
2121

2222
. "github.com/onsi/ginkgo/v2"
23-
"github.com/onsi/ginkgo/v2/reporters"
2423
. "github.com/onsi/gomega"
2524

2625
"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
@@ -40,6 +39,5 @@ var _ = BeforeSuite(func() {
4039
})
4140

4241
var _ = ReportAfterSuite("Report to Prow", func(report Report) {
43-
reporters.ReportViaDeprecatedReporter(printer.NewlineReporter{}, report) //nolint // For migration of custom reporter check https://onsi.github.io/ginkgo/MIGRATING_TO_V2#migration-strategy-2
44-
reporters.ReportViaDeprecatedReporter(printer.NewProwReporter(suiteName), report) //nolint // For migration of custom reporter check https://onsi.github.io/ginkgo/MIGRATING_TO_V2#migration-strategy-2
42+
printer.AddReport(report, suiteName)
4543
})

‎pkg/client/fake/client_suite_test.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import (
2020
"testing"
2121

2222
. "github.com/onsi/ginkgo/v2"
23-
"github.com/onsi/ginkgo/v2/reporters"
2423
. "github.com/onsi/gomega"
2524
"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
2625

@@ -40,6 +39,5 @@ var _ = BeforeSuite(func() {
4039
})
4140

4241
var _ = ReportAfterSuite("Report to Prow", func(report Report) {
43-
reporters.ReportViaDeprecatedReporter(printer.NewlineReporter{}, report) //nolint // For migration of custom reporter check https://onsi.github.io/ginkgo/MIGRATING_TO_V2#migration-strategy-2
44-
reporters.ReportViaDeprecatedReporter(printer.NewProwReporter(suiteName), report) //nolint // For migration of custom reporter check https://onsi.github.io/ginkgo/MIGRATING_TO_V2#migration-strategy-2
42+
printer.AddReport(report, suiteName)
4543
})

‎pkg/cluster/cluster_suite_test.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import (
2121
"testing"
2222

2323
. "github.com/onsi/ginkgo/v2"
24-
"github.com/onsi/ginkgo/v2/reporters"
2524
. "github.com/onsi/gomega"
2625
"k8s.io/client-go/kubernetes"
2726
"k8s.io/client-go/rest"
@@ -72,6 +71,5 @@ var _ = AfterSuite(func() {
7271
})
7372

7473
var _ = ReportAfterSuite("Report to Prow", func(report Report) {
75-
reporters.ReportViaDeprecatedReporter(printer.NewlineReporter{}, report) //nolint // For migration of custom reporter check https://onsi.github.io/ginkgo/MIGRATING_TO_V2#migration-strategy-2
76-
reporters.ReportViaDeprecatedReporter(printer.NewProwReporter(suiteName), report) //nolint // For migration of custom reporter check https://onsi.github.io/ginkgo/MIGRATING_TO_V2#migration-strategy-2
74+
printer.AddReport(report, suiteName)
7775
})

‎pkg/config/config_suite_test.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import (
2020
"testing"
2121

2222
. "github.com/onsi/ginkgo/v2"
23-
"github.com/onsi/ginkgo/v2/reporters"
2423
. "github.com/onsi/gomega"
2524

2625
"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
@@ -34,6 +33,5 @@ func TestScheme(t *testing.T) {
3433
}
3534

3635
var _ = ReportAfterSuite("Report to Prow", func(report Report) {
37-
reporters.ReportViaDeprecatedReporter(printer.NewlineReporter{}, report) //nolint // For migration of custom reporter check https://onsi.github.io/ginkgo/MIGRATING_TO_V2#migration-strategy-2
38-
reporters.ReportViaDeprecatedReporter(printer.NewProwReporter(suiteName), report) //nolint // For migration of custom reporter check https://onsi.github.io/ginkgo/MIGRATING_TO_V2#migration-strategy-2
36+
printer.AddReport(report, suiteName)
3937
})

‎pkg/controller/controller_suite_test.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import (
2121
"testing"
2222

2323
. "github.com/onsi/ginkgo/v2"
24-
"github.com/onsi/ginkgo/v2/reporters"
2524
. "github.com/onsi/gomega"
2625
"k8s.io/apimachinery/pkg/runtime/schema"
2726
"k8s.io/client-go/kubernetes"
@@ -94,6 +93,5 @@ var _ = AfterSuite(func() {
9493
})
9594

9695
var _ = ReportAfterSuite("Report to Prow", func(report Report) {
97-
reporters.ReportViaDeprecatedReporter(printer.NewlineReporter{}, report) //nolint // For migration of custom reporter check https://onsi.github.io/ginkgo/MIGRATING_TO_V2#migration-strategy-2
98-
reporters.ReportViaDeprecatedReporter(printer.NewProwReporter(suiteName), report) //nolint // For migration of custom reporter check https://onsi.github.io/ginkgo/MIGRATING_TO_V2#migration-strategy-2
96+
printer.AddReport(report, suiteName)
9997
})

‎pkg/controller/controllerutil/controllerutil_suite_test.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import (
2020
"testing"
2121

2222
. "github.com/onsi/ginkgo/v2"
23-
"github.com/onsi/ginkgo/v2/reporters"
2423
. "github.com/onsi/gomega"
2524

2625
"k8s.io/client-go/rest"
@@ -57,6 +56,5 @@ var _ = AfterSuite(func() {
5756
})
5857

5958
var _ = ReportAfterSuite("Report to Prow", func(report Report) {
60-
reporters.ReportViaDeprecatedReporter(printer.NewlineReporter{}, report) //nolint // For migration of custom reporter check https://onsi.github.io/ginkgo/MIGRATING_TO_V2#migration-strategy-2
61-
reporters.ReportViaDeprecatedReporter(printer.NewProwReporter(suiteName), report) //nolint // For migration of custom reporter check https://onsi.github.io/ginkgo/MIGRATING_TO_V2#migration-strategy-2
59+
printer.AddReport(report, suiteName)
6260
})

‎pkg/envtest/envtest_suite_test.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import (
2020
"testing"
2121

2222
. "github.com/onsi/ginkgo/v2"
23-
"github.com/onsi/ginkgo/v2/reporters"
2423
. "github.com/onsi/gomega"
2524
admissionv1 "k8s.io/api/admissionregistration/v1"
2625
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -138,6 +137,5 @@ var _ = AfterSuite(func() {
138137
})
139138

140139
var _ = ReportAfterSuite("Report to Prow", func(report Report) {
141-
reporters.ReportViaDeprecatedReporter(printer.NewlineReporter{}, report) //nolint // For migration of custom reporter check https://onsi.github.io/ginkgo/MIGRATING_TO_V2#migration-strategy-2
142-
reporters.ReportViaDeprecatedReporter(printer.NewProwReporter(suiteName), report) //nolint // For migration of custom reporter check https://onsi.github.io/ginkgo/MIGRATING_TO_V2#migration-strategy-2
140+
printer.AddReport(report, suiteName)
143141
})

‎pkg/envtest/ginkgo_test.go

Lines changed: 0 additions & 27 deletions
This file was deleted.

‎pkg/envtest/printer/ginkgo.go

Lines changed: 0 additions & 52 deletions
This file was deleted.

0 commit comments

Comments
 (0)