@@ -19,15 +19,26 @@ var TestEnv *TestEnvironment
19
19
20
20
// Initialize the test environment. BeforeSuite will be only executed if this package is loaded by the test.
21
21
var _ = BeforeSuite (func (ctx SpecContext ) {
22
+ By ("Initialize loggers for testing" )
23
+ // Uninitialized logger spits stacktrace as warning during test execution
24
+ logger := textlogger .NewLogger (textlogger .NewConfig ())
25
+ // use klog as the internal logger for this envtest environment.
26
+ log .SetLogger (logger )
27
+ // additionally force all of the controllers to use the Ginkgo logger.
28
+ ctrl .SetLogger (logger )
29
+ klog .InitFlags (nil )
30
+ // add logger for ginkgo
31
+ klog .SetOutput (GinkgoWriter )
32
+
22
33
By ("Starting test environment" )
23
34
testEnvConfig := NewTestEnvironmentConfiguration ()
24
35
var err error
25
36
TestEnv , err = testEnvConfig .Build ()
26
37
if err != nil {
27
38
panic (err )
28
39
}
40
+ By ("Starting the manager" )
29
41
go func () {
30
- By ("Starting the manager" )
31
42
defer GinkgoRecover ()
32
43
Expect (TestEnv .StartManager (ctx )).To (Succeed ())
33
44
}()
@@ -36,15 +47,3 @@ var _ = BeforeSuite(func(ctx SpecContext) {
36
47
var _ = AfterSuite (func (ctx context.Context ) {
37
48
Expect (TestEnv .Stop ()).To (Succeed ())
38
49
})
39
-
40
- //nolint:gochecknoinits //needed for test initialization
41
- func init () {
42
- klog .InitFlags (nil )
43
- logger := textlogger .NewLogger (textlogger .NewConfig ())
44
- // use klog as the internal logger for this envtest environment.
45
- log .SetLogger (logger )
46
- // additionally force all of the controllers to use the Ginkgo logger.
47
- ctrl .SetLogger (logger )
48
- // add logger for ginkgo
49
- klog .SetOutput (GinkgoWriter )
50
- }
0 commit comments