🐛 Envtest: Do not pull in ginkgo outside of _test.go files

alvaroaleman · alvaroaleman · commit 54dfdee426fc · 2020-01-26T17:09:08.000+01:00
diff --git a/pkg/builder/builder_suite_test.go b/pkg/builder/builder_suite_test.go
@@ -28,6 +28,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/client-go/rest"
 	"sigs.k8s.io/controller-runtime/pkg/envtest"
+	"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
 	"sigs.k8s.io/controller-runtime/pkg/internal/testing/integration/addr"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
@@ -37,7 +38,7 @@ import (
 
 func TestBuilder(t *testing.T) {
 	RegisterFailHandler(Fail)
-	RunSpecsWithDefaultAndCustomReporters(t, "application Suite", []Reporter{envtest.NewlineReporter{}})
+	RunSpecsWithDefaultAndCustomReporters(t, "application Suite", []Reporter{printer.NewlineReporter{}})
 }
 
 var testenv *envtest.Environment
diff --git a/pkg/cache/cache_suite_test.go b/pkg/cache/cache_suite_test.go
@@ -24,13 +24,14 @@ import (
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
 	"sigs.k8s.io/controller-runtime/pkg/envtest"
+	"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 )
 
 func TestSource(t *testing.T) {
 	RegisterFailHandler(Fail)
-	RunSpecsWithDefaultAndCustomReporters(t, "Cache Suite", []Reporter{envtest.NewlineReporter{}})
+	RunSpecsWithDefaultAndCustomReporters(t, "Cache Suite", []Reporter{printer.NewlineReporter{}})
 }
 
 var testenv *envtest.Environment
diff --git a/pkg/client/apiutil/apiutil_suite_test.go b/pkg/client/apiutil/apiutil_suite_test.go
@@ -22,15 +22,15 @@ import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 	"k8s.io/client-go/rest"
-	"sigs.k8s.io/controller-runtime/pkg/envtest"
+	"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
 
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 )
 
 func TestSource(t *testing.T) {
 	RegisterFailHandler(Fail)
-	RunSpecsWithDefaultAndCustomReporters(t, "API Utilities Test Suite", []Reporter{envtest.NewlineReporter{}})
+	RunSpecsWithDefaultAndCustomReporters(t, "API Utilities Test Suite", []Reporter{printer.NewlineReporter{}})
 }
 
 var cfg *rest.Config
diff --git a/pkg/client/client_suite_test.go b/pkg/client/client_suite_test.go
@@ -24,14 +24,15 @@ import (
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
 	"sigs.k8s.io/controller-runtime/pkg/envtest"
+	"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
 
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 )
 
 func TestSource(t *testing.T) {
 	RegisterFailHandler(Fail)
-	RunSpecsWithDefaultAndCustomReporters(t, "Controller Integration Suite", []Reporter{envtest.NewlineReporter{}})
+	RunSpecsWithDefaultAndCustomReporters(t, "Controller Integration Suite", []Reporter{printer.NewlineReporter{}})
 }
 
 var testenv *envtest.Environment
diff --git a/pkg/client/fake/client_suite_test.go b/pkg/client/fake/client_suite_test.go
@@ -21,15 +21,15 @@ import (
 
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
-	"sigs.k8s.io/controller-runtime/pkg/envtest"
+	"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
 
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 )
 
 func TestSource(t *testing.T) {
 	RegisterFailHandler(Fail)
-	RunSpecsWithDefaultAndCustomReporters(t, "Controller Integration Suite", []Reporter{envtest.NewlineReporter{}})
+	RunSpecsWithDefaultAndCustomReporters(t, "Controller Integration Suite", []Reporter{printer.NewlineReporter{}})
 }
 
 var _ = BeforeSuite(func(done Done) {
diff --git a/pkg/controller/controller_suite_test.go b/pkg/controller/controller_suite_test.go
@@ -24,14 +24,15 @@ import (
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
 	"sigs.k8s.io/controller-runtime/pkg/envtest"
+	"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 	"sigs.k8s.io/controller-runtime/pkg/metrics"
 )
 
 func TestSource(t *testing.T) {
 	RegisterFailHandler(Fail)
-	RunSpecsWithDefaultAndCustomReporters(t, "Controller Integration Suite", []Reporter{envtest.NewlineReporter{}})
+	RunSpecsWithDefaultAndCustomReporters(t, "Controller Integration Suite", []Reporter{printer.NewlineReporter{}})
 }
 
 var testenv *envtest.Environment
diff --git a/pkg/envtest/ginkgo_test.go b/pkg/envtest/ginkgo_test.go
diff --git a/pkg/handler/eventhandler_suite_test.go b/pkg/handler/eventhandler_suite_test.go
@@ -23,13 +23,14 @@ import (
 	. "github.com/onsi/gomega"
 	"k8s.io/client-go/rest"
 	"sigs.k8s.io/controller-runtime/pkg/envtest"
+	"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 )
 
 func TestEventhandler(t *testing.T) {
 	RegisterFailHandler(Fail)
-	RunSpecsWithDefaultAndCustomReporters(t, "Eventhandler Suite", []Reporter{envtest.NewlineReporter{}})
+	RunSpecsWithDefaultAndCustomReporters(t, "Eventhandler Suite", []Reporter{printer.NewlineReporter{}})
 }
 
 var testenv *envtest.Environment
diff --git a/pkg/healthz/healthz_suite_test.go b/pkg/healthz/healthz_suite_test.go
@@ -21,14 +21,14 @@ import (
 
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
-	"sigs.k8s.io/controller-runtime/pkg/envtest"
+	"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 )
 
 func TestHealthz(t *testing.T) {
 	RegisterFailHandler(Fail)
-	RunSpecsWithDefaultAndCustomReporters(t, "Healthz Suite", []Reporter{envtest.NewlineReporter{}})
+	RunSpecsWithDefaultAndCustomReporters(t, "Healthz Suite", []Reporter{printer.NewlineReporter{}})
 }
 
 var _ = BeforeSuite(func() {
diff --git a/pkg/internal/controller/controller_suite_test.go b/pkg/internal/controller/controller_suite_test.go
@@ -24,13 +24,14 @@ import (
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
 	"sigs.k8s.io/controller-runtime/pkg/envtest"
+	"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 )
 
 func TestSource(t *testing.T) {
 	RegisterFailHandler(Fail)
-	RunSpecsWithDefaultAndCustomReporters(t, "Controller Integration Suite", []Reporter{envtest.NewlineReporter{}})
+	RunSpecsWithDefaultAndCustomReporters(t, "Controller Integration Suite", []Reporter{printer.NewlineReporter{}})
 }
 
 var testenv *envtest.Environment
diff --git a/pkg/internal/recorder/recorder_suite_test.go b/pkg/internal/recorder/recorder_suite_test.go
@@ -24,13 +24,14 @@ import (
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
 	"sigs.k8s.io/controller-runtime/pkg/envtest"
+	"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 )
 
 func TestRecorder(t *testing.T) {
 	RegisterFailHandler(Fail)
-	RunSpecsWithDefaultAndCustomReporters(t, "Recorder Integration Suite", []Reporter{envtest.NewlineReporter{}})
+	RunSpecsWithDefaultAndCustomReporters(t, "Recorder Integration Suite", []Reporter{printer.NewlineReporter{}})
 }
 
 var testenv *envtest.Environment
diff --git a/pkg/manager/manager_suite_test.go b/pkg/manager/manager_suite_test.go
@@ -24,14 +24,15 @@ import (
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
 	"sigs.k8s.io/controller-runtime/pkg/envtest"
+	"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 	"sigs.k8s.io/controller-runtime/pkg/metrics"
 )
 
 func TestSource(t *testing.T) {
 	RegisterFailHandler(Fail)
-	RunSpecsWithDefaultAndCustomReporters(t, "Controller Integration Suite", []Reporter{envtest.NewlineReporter{}})
+	RunSpecsWithDefaultAndCustomReporters(t, "Controller Integration Suite", []Reporter{printer.NewlineReporter{}})
 }
 
 var testenv *envtest.Environment
diff --git a/pkg/manager/signals/signals_suite_test.go b/pkg/manager/signals/signals_suite_test.go
@@ -22,12 +22,12 @@ import (
 
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
-	"sigs.k8s.io/controller-runtime/pkg/envtest"
+	"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
 )
 
 func TestSource(t *testing.T) {
 	RegisterFailHandler(Fail)
-	RunSpecsWithDefaultAndCustomReporters(t, "Runtime Signal Suite", []Reporter{envtest.NewlineReporter{}})
+	RunSpecsWithDefaultAndCustomReporters(t, "Runtime Signal Suite", []Reporter{printer.NewlineReporter{}})
 }
 
 var _ = BeforeSuite(func() {
diff --git a/pkg/predicate/predicate_suite_test.go b/pkg/predicate/predicate_suite_test.go
@@ -21,14 +21,14 @@ import (
 
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
-	"sigs.k8s.io/controller-runtime/pkg/envtest"
+	"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 )
 
 func TestPredicate(t *testing.T) {
 	RegisterFailHandler(Fail)
-	RunSpecsWithDefaultAndCustomReporters(t, "Predicate Suite", []Reporter{envtest.NewlineReporter{}})
+	RunSpecsWithDefaultAndCustomReporters(t, "Predicate Suite", []Reporter{printer.NewlineReporter{}})
 }
 
 var _ = BeforeSuite(func() {
diff --git a/pkg/reconcile/reconcile_suite_test.go b/pkg/reconcile/reconcile_suite_test.go
@@ -21,14 +21,14 @@ import (
 
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
-	"sigs.k8s.io/controller-runtime/pkg/envtest"
+	"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 )
 
 func TestReconcile(t *testing.T) {
 	RegisterFailHandler(Fail)
-	RunSpecsWithDefaultAndCustomReporters(t, "reconcile Suite", []Reporter{envtest.NewlineReporter{}})
+	RunSpecsWithDefaultAndCustomReporters(t, "reconcile Suite", []Reporter{printer.NewlineReporter{}})
 }
 
 var _ = BeforeSuite(func() {
diff --git a/pkg/runtime/inject/inject_suite_test.go b/pkg/runtime/inject/inject_suite_test.go
@@ -21,10 +21,10 @@ import (
 
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
-	"sigs.k8s.io/controller-runtime/pkg/envtest"
+	"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
 )
 
 func TestSource(t *testing.T) {
 	RegisterFailHandler(Fail)
-	RunSpecsWithDefaultAndCustomReporters(t, "Runtime Injection Suite", []Reporter{envtest.NewlineReporter{}})
+	RunSpecsWithDefaultAndCustomReporters(t, "Runtime Injection Suite", []Reporter{printer.NewlineReporter{}})
 }
diff --git a/pkg/source/internal/internal_suite_test.go b/pkg/source/internal/internal_suite_test.go
@@ -21,14 +21,14 @@ import (
 
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
-	"sigs.k8s.io/controller-runtime/pkg/envtest"
+	"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 )
 
 func TestInternal(t *testing.T) {
 	RegisterFailHandler(Fail)
-	RunSpecsWithDefaultAndCustomReporters(t, "Internal Suite", []Reporter{envtest.NewlineReporter{}})
+	RunSpecsWithDefaultAndCustomReporters(t, "Internal Suite", []Reporter{printer.NewlineReporter{}})
 }
 
 var _ = BeforeSuite(func() {
diff --git a/pkg/source/source_suite_test.go b/pkg/source/source_suite_test.go
@@ -25,13 +25,14 @@ import (
 	"k8s.io/client-go/rest"
 	"sigs.k8s.io/controller-runtime/pkg/cache"
 	"sigs.k8s.io/controller-runtime/pkg/envtest"
+	"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 )
 
 func TestSource(t *testing.T) {
 	RegisterFailHandler(Fail)
-	RunSpecsWithDefaultAndCustomReporters(t, "Source Suite", []Reporter{envtest.NewlineReporter{}})
+	RunSpecsWithDefaultAndCustomReporters(t, "Source Suite", []Reporter{printer.NewlineReporter{}})
 }
 
 var testenv *envtest.Environment
diff --git a/pkg/webhook/admission/admission_suite_test.go b/pkg/webhook/admission/admission_suite_test.go
@@ -22,14 +22,14 @@ import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 
-	"sigs.k8s.io/controller-runtime/pkg/envtest"
+	"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 )
 
 func TestAdmissionWebhook(t *testing.T) {
 	RegisterFailHandler(Fail)
-	RunSpecsWithDefaultAndCustomReporters(t, "application Suite", []Reporter{envtest.NewlineReporter{}})
+	RunSpecsWithDefaultAndCustomReporters(t, "application Suite", []Reporter{printer.NewlineReporter{}})
 }
 
 var _ = BeforeSuite(func(done Done) {
diff --git a/pkg/webhook/conversion/conversion_suite_test.go b/pkg/webhook/conversion/conversion_suite_test.go
@@ -21,14 +21,14 @@ import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 
-	"sigs.k8s.io/controller-runtime/pkg/envtest"
+	"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 )
 
 func TestConversionWebhook(t *testing.T) {
 	RegisterFailHandler(Fail)
-	RunSpecsWithDefaultAndCustomReporters(t, "CRD conversion Suite", []Reporter{envtest.NewlineReporter{}})
+	RunSpecsWithDefaultAndCustomReporters(t, "CRD conversion Suite", []Reporter{printer.NewlineReporter{}})
 }
 
 var _ = BeforeSuite(func(done Done) {
diff --git a/pkg/webhook/webhook_suite_test.go b/pkg/webhook/webhook_suite_test.go
@@ -25,13 +25,14 @@ import (
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
 	"sigs.k8s.io/controller-runtime/pkg/envtest"
+	"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 )
 
 func TestSource(t *testing.T) {
 	RegisterFailHandler(Fail)
-	RunSpecsWithDefaultAndCustomReporters(t, "Webhook Integration Suite", []Reporter{envtest.NewlineReporter{}})
+	RunSpecsWithDefaultAndCustomReporters(t, "Webhook Integration Suite", []Reporter{printer.NewlineReporter{}})
 }
 
 var testenv *envtest.Environment

Original file line number	Diff line number	Diff line change
`@@ -24,13 +24,14 @@ import (`
`24`	`24`	`"k8s.io/client-go/kubernetes"`
`25`	`25`	`"k8s.io/client-go/rest"`
`26`	`26`	`"sigs.k8s.io/controller-runtime/pkg/envtest"`
	`27`	`+ "sigs.k8s.io/controller-runtime/pkg/envtest/printer"`
`27`	`28`	`logf "sigs.k8s.io/controller-runtime/pkg/log"`
`28`	`29`	`"sigs.k8s.io/controller-runtime/pkg/log/zap"`
`29`	`30`	`)`
`30`	`31`
`31`	`32`	`func TestSource(t *testing.T) {`
`32`	`33`	`RegisterFailHandler(Fail)`
`33`		`- RunSpecsWithDefaultAndCustomReporters(t, "Cache Suite", []Reporter{envtest.NewlineReporter{}})`
	`34`	`+ RunSpecsWithDefaultAndCustomReporters(t, "Cache Suite", []Reporter{printer.NewlineReporter{}})`
`34`	`35`	`}`
`35`	`36`
`36`	`37`	`var testenv *envtest.Environment`
Original file line number	Diff line number	Diff line change
`@@ -24,14 +24,15 @@ import (`
`24`	`24`	`"k8s.io/client-go/kubernetes"`
`25`	`25`	`"k8s.io/client-go/rest"`
`26`	`26`	`"sigs.k8s.io/controller-runtime/pkg/envtest"`
	`27`	`+ "sigs.k8s.io/controller-runtime/pkg/envtest/printer"`
`27`	`28`
`28`	`29`	`logf "sigs.k8s.io/controller-runtime/pkg/log"`
`29`	`30`	`"sigs.k8s.io/controller-runtime/pkg/log/zap"`
`30`	`31`	`)`
`31`	`32`
`32`	`33`	`func TestSource(t *testing.T) {`
`33`	`34`	`RegisterFailHandler(Fail)`
`34`		`- RunSpecsWithDefaultAndCustomReporters(t, "Controller Integration Suite", []Reporter{envtest.NewlineReporter{}})`
	`35`	`+ RunSpecsWithDefaultAndCustomReporters(t, "Controller Integration Suite", []Reporter{printer.NewlineReporter{}})`
`35`	`36`	`}`
`36`	`37`
`37`	`38`	`var testenv *envtest.Environment`
Original file line number	Diff line number	Diff line change
`@@ -21,15 +21,15 @@ import (`
`21`	`21`
`22`	`22`	`. "github.com/onsi/ginkgo"`
`23`	`23`	`. "github.com/onsi/gomega"`
`24`		`- "sigs.k8s.io/controller-runtime/pkg/envtest"`
	`24`	`+ "sigs.k8s.io/controller-runtime/pkg/envtest/printer"`
`25`	`25`
`26`	`26`	`logf "sigs.k8s.io/controller-runtime/pkg/log"`
`27`	`27`	`"sigs.k8s.io/controller-runtime/pkg/log/zap"`
`28`	`28`	`)`
`29`	`29`
`30`	`30`	`func TestSource(t *testing.T) {`
`31`	`31`	`RegisterFailHandler(Fail)`
`32`		`- RunSpecsWithDefaultAndCustomReporters(t, "Controller Integration Suite", []Reporter{envtest.NewlineReporter{}})`
	`32`	`+ RunSpecsWithDefaultAndCustomReporters(t, "Controller Integration Suite", []Reporter{printer.NewlineReporter{}})`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`var _ = BeforeSuite(func(done Done) {`
Original file line number	Diff line number	Diff line change
`@@ -23,13 +23,14 @@ import (`
`23`	`23`	`. "github.com/onsi/gomega"`
`24`	`24`	`"k8s.io/client-go/rest"`
`25`	`25`	`"sigs.k8s.io/controller-runtime/pkg/envtest"`
	`26`	`+ "sigs.k8s.io/controller-runtime/pkg/envtest/printer"`
`26`	`27`	`logf "sigs.k8s.io/controller-runtime/pkg/log"`
`27`	`28`	`"sigs.k8s.io/controller-runtime/pkg/log/zap"`
`28`	`29`	`)`
`29`	`30`
`30`	`31`	`func TestEventhandler(t *testing.T) {`
`31`	`32`	`RegisterFailHandler(Fail)`
`32`		`- RunSpecsWithDefaultAndCustomReporters(t, "Eventhandler Suite", []Reporter{envtest.NewlineReporter{}})`
	`33`	`+ RunSpecsWithDefaultAndCustomReporters(t, "Eventhandler Suite", []Reporter{printer.NewlineReporter{}})`
`33`	`34`	`}`
`34`	`35`
`35`	`36`	`var testenv *envtest.Environment`
Original file line number	Diff line number	Diff line change
`@@ -21,14 +21,14 @@ import (`
`21`	`21`
`22`	`22`	`. "github.com/onsi/ginkgo"`
`23`	`23`	`. "github.com/onsi/gomega"`
`24`		`- "sigs.k8s.io/controller-runtime/pkg/envtest"`
	`24`	`+ "sigs.k8s.io/controller-runtime/pkg/envtest/printer"`
`25`	`25`	`logf "sigs.k8s.io/controller-runtime/pkg/log"`
`26`	`26`	`"sigs.k8s.io/controller-runtime/pkg/log/zap"`
`27`	`27`	`)`
`28`	`28`
`29`	`29`	`func TestHealthz(t *testing.T) {`
`30`	`30`	`RegisterFailHandler(Fail)`
`31`		`- RunSpecsWithDefaultAndCustomReporters(t, "Healthz Suite", []Reporter{envtest.NewlineReporter{}})`
	`31`	`+ RunSpecsWithDefaultAndCustomReporters(t, "Healthz Suite", []Reporter{printer.NewlineReporter{}})`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`var _ = BeforeSuite(func() {`
Original file line number	Diff line number	Diff line change
`@@ -22,12 +22,12 @@ import (`
`22`	`22`
`23`	`23`	`. "github.com/onsi/ginkgo"`
`24`	`24`	`. "github.com/onsi/gomega"`
`25`		`- "sigs.k8s.io/controller-runtime/pkg/envtest"`
	`25`	`+ "sigs.k8s.io/controller-runtime/pkg/envtest/printer"`
`26`	`26`	`)`
`27`	`27`
`28`	`28`	`func TestSource(t *testing.T) {`
`29`	`29`	`RegisterFailHandler(Fail)`
`30`		`- RunSpecsWithDefaultAndCustomReporters(t, "Runtime Signal Suite", []Reporter{envtest.NewlineReporter{}})`
	`30`	`+ RunSpecsWithDefaultAndCustomReporters(t, "Runtime Signal Suite", []Reporter{printer.NewlineReporter{}})`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`var _ = BeforeSuite(func() {`
Original file line number	Diff line number	Diff line change
`@@ -21,10 +21,10 @@ import (`
`21`	`21`
`22`	`22`	`. "github.com/onsi/ginkgo"`
`23`	`23`	`. "github.com/onsi/gomega"`
`24`		`- "sigs.k8s.io/controller-runtime/pkg/envtest"`
	`24`	`+ "sigs.k8s.io/controller-runtime/pkg/envtest/printer"`
`25`	`25`	`)`
`26`	`26`
`27`	`27`	`func TestSource(t *testing.T) {`
`28`	`28`	`RegisterFailHandler(Fail)`
`29`		`- RunSpecsWithDefaultAndCustomReporters(t, "Runtime Injection Suite", []Reporter{envtest.NewlineReporter{}})`
	`29`	`+ RunSpecsWithDefaultAndCustomReporters(t, "Runtime Injection Suite", []Reporter{printer.NewlineReporter{}})`
`30`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,13 +25,14 @@ import (`
`25`	`25`	`"k8s.io/client-go/rest"`
`26`	`26`	`"sigs.k8s.io/controller-runtime/pkg/cache"`
`27`	`27`	`"sigs.k8s.io/controller-runtime/pkg/envtest"`
	`28`	`+ "sigs.k8s.io/controller-runtime/pkg/envtest/printer"`
`28`	`29`	`logf "sigs.k8s.io/controller-runtime/pkg/log"`
`29`	`30`	`"sigs.k8s.io/controller-runtime/pkg/log/zap"`
`30`	`31`	`)`
`31`	`32`
`32`	`33`	`func TestSource(t *testing.T) {`
`33`	`34`	`RegisterFailHandler(Fail)`
`34`		`- RunSpecsWithDefaultAndCustomReporters(t, "Source Suite", []Reporter{envtest.NewlineReporter{}})`
	`35`	`+ RunSpecsWithDefaultAndCustomReporters(t, "Source Suite", []Reporter{printer.NewlineReporter{}})`
`35`	`36`	`}`
`36`	`37`
`37`	`38`	`var testenv *envtest.Environment`
Original file line number	Diff line number	Diff line change
`@@ -22,14 +22,14 @@ import (`
`22`	`22`	`. "github.com/onsi/ginkgo"`
`23`	`23`	`. "github.com/onsi/gomega"`
`24`	`24`
`25`		`- "sigs.k8s.io/controller-runtime/pkg/envtest"`
	`25`	`+ "sigs.k8s.io/controller-runtime/pkg/envtest/printer"`
`26`	`26`	`logf "sigs.k8s.io/controller-runtime/pkg/log"`
`27`	`27`	`"sigs.k8s.io/controller-runtime/pkg/log/zap"`
`28`	`28`	`)`
`29`	`29`
`30`	`30`	`func TestAdmissionWebhook(t *testing.T) {`
`31`	`31`	`RegisterFailHandler(Fail)`
`32`		`- RunSpecsWithDefaultAndCustomReporters(t, "application Suite", []Reporter{envtest.NewlineReporter{}})`
	`32`	`+ RunSpecsWithDefaultAndCustomReporters(t, "application Suite", []Reporter{printer.NewlineReporter{}})`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`var _ = BeforeSuite(func(done Done) {`