Ensure errors in tests are logged to the GinkgoWriter

JoelSpeed · JoelSpeed · commit b6cca79cb9ed · 2021-02-10T19:50:04.000Z
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,8 @@
 
 ## Changes since v7.0.1
 
+- [#1039](https://github.com/oauth2-proxy/oauth2-proxy/pull/1039) Ensure errors in tests are logged to the GinkgoWriter (@JoelSpeed)
+
 # V7.0.1
 
 ## Release Highlights
diff --git a/main_suite_test.go b/main_suite_test.go
@@ -10,6 +10,7 @@ import (
 
 func TestMainSuite(t *testing.T) {
 	logger.SetOutput(GinkgoWriter)
+	logger.SetErrOutput(GinkgoWriter)
 
 	RegisterFailHandler(Fail)
 	RunSpecs(t, "Main Suite")
diff --git a/pkg/apis/middleware/middleware_suite_test.go b/pkg/apis/middleware/middleware_suite_test.go
@@ -13,6 +13,7 @@ import (
 // this functionality
 func TestMiddlewareSuite(t *testing.T) {
 	logger.SetOutput(GinkgoWriter)
+	logger.SetErrOutput(GinkgoWriter)
 
 	RegisterFailHandler(Fail)
 	RunSpecs(t, "Middleware API")
diff --git a/pkg/apis/options/options_suite_test.go b/pkg/apis/options/options_suite_test.go
@@ -10,6 +10,7 @@ import (
 
 func TestOptionsSuite(t *testing.T) {
 	logger.SetOutput(GinkgoWriter)
+	logger.SetErrOutput(GinkgoWriter)
 
 	RegisterFailHandler(Fail)
 	RunSpecs(t, "Options Suite")
diff --git a/pkg/apis/options/util/util_suite_test.go b/pkg/apis/options/util/util_suite_test.go
@@ -10,6 +10,7 @@ import (
 
 func TestUtilSuite(t *testing.T) {
 	logger.SetOutput(GinkgoWriter)
+	logger.SetErrOutput(GinkgoWriter)
 
 	RegisterFailHandler(Fail)
 	RunSpecs(t, "Options Util Suite")
diff --git a/pkg/authentication/basic/basic_suite_test.go b/pkg/authentication/basic/basic_suite_test.go
@@ -10,6 +10,7 @@ import (
 
 func TestBasicSuite(t *testing.T) {
 	logger.SetOutput(GinkgoWriter)
+	logger.SetErrOutput(GinkgoWriter)
 
 	RegisterFailHandler(Fail)
 	RunSpecs(t, "Basic")
diff --git a/pkg/header/header_suite_test.go b/pkg/header/header_suite_test.go
@@ -17,6 +17,7 @@ var (
 
 func TestHeaderSuite(t *testing.T) {
 	logger.SetOutput(GinkgoWriter)
+	logger.SetErrOutput(GinkgoWriter)
 
 	RegisterFailHandler(Fail)
 	RunSpecs(t, "Header")
diff --git a/pkg/middleware/middleware_suite_test.go b/pkg/middleware/middleware_suite_test.go
@@ -11,6 +11,7 @@ import (
 
 func TestMiddlewareSuite(t *testing.T) {
 	logger.SetOutput(GinkgoWriter)
+	logger.SetErrOutput(GinkgoWriter)
 
 	RegisterFailHandler(Fail)
 	RunSpecs(t, "Middleware")
diff --git a/pkg/requests/requests_suite_test.go b/pkg/requests/requests_suite_test.go
@@ -21,6 +21,7 @@ var (
 
 func TestRequetsSuite(t *testing.T) {
 	logger.SetOutput(GinkgoWriter)
+	logger.SetErrOutput(GinkgoWriter)
 	log.SetOutput(GinkgoWriter)
 
 	RegisterFailHandler(Fail)
diff --git a/pkg/requests/util/util_suite_test.go b/pkg/requests/util/util_suite_test.go
@@ -13,6 +13,7 @@ import (
 // this functionality
 func TestRequestUtilSuite(t *testing.T) {
 	logger.SetOutput(GinkgoWriter)
+	logger.SetErrOutput(GinkgoWriter)
 
 	RegisterFailHandler(Fail)
 	RunSpecs(t, "Request Utils")
diff --git a/pkg/sessions/cookie/session_store_test.go b/pkg/sessions/cookie/session_store_test.go
@@ -19,6 +19,8 @@ import (
 
 func TestSessionStore(t *testing.T) {
 	logger.SetOutput(GinkgoWriter)
+	logger.SetErrOutput(GinkgoWriter)
+
 	RegisterFailHandler(Fail)
 	RunSpecs(t, "Cookie SessionStore")
 }
diff --git a/pkg/sessions/persistence/persistence_suite_test.go b/pkg/sessions/persistence/persistence_suite_test.go
@@ -10,6 +10,8 @@ import (
 
 func TestPersistenceSuite(t *testing.T) {
 	logger.SetOutput(GinkgoWriter)
+	logger.SetErrOutput(GinkgoWriter)
+
 	RegisterFailHandler(Fail)
 	RunSpecs(t, "Persistence")
 }
diff --git a/pkg/sessions/redis/redis_store_test.go b/pkg/sessions/redis/redis_store_test.go
@@ -33,6 +33,7 @@ func (l *wrappedRedisLogger) Printf(_ context.Context, format string, v ...inter
 
 func TestSessionStore(t *testing.T) {
 	logger.SetOutput(GinkgoWriter)
+	logger.SetErrOutput(GinkgoWriter)
 
 	redisLogger := &wrappedRedisLogger{Logger: log.New(os.Stderr, "redis: ", log.LstdFlags|log.Lshortfile)}
 	redisLogger.SetOutput(GinkgoWriter)
diff --git a/pkg/sessions/session_store_test.go b/pkg/sessions/session_store_test.go
@@ -18,6 +18,7 @@ import (
 
 func TestSessionStore(t *testing.T) {
 	logger.SetOutput(GinkgoWriter)
+	logger.SetErrOutput(GinkgoWriter)
 
 	RegisterFailHandler(Fail)
 	RunSpecs(t, "SessionStore")
diff --git a/pkg/upstream/upstream_suite_test.go b/pkg/upstream/upstream_suite_test.go
@@ -26,6 +26,7 @@ var (
 
 func TestUpstreamSuite(t *testing.T) {
 	logger.SetOutput(GinkgoWriter)
+	logger.SetErrOutput(GinkgoWriter)
 	log.SetOutput(GinkgoWriter)
 
 	RegisterFailHandler(Fail)
diff --git a/pkg/validation/validation_suite_test.go b/pkg/validation/validation_suite_test.go
@@ -10,6 +10,7 @@ import (
 
 func TestValidationSuite(t *testing.T) {
 	logger.SetOutput(GinkgoWriter)
+	logger.SetErrOutput(GinkgoWriter)
 
 	RegisterFailHandler(Fail)
 	RunSpecs(t, "Validation Suite")
diff --git a/providers/providers_suite_test.go b/providers/providers_suite_test.go
@@ -10,6 +10,7 @@ import (
 
 func TestProviderSuite(t *testing.T) {
 	logger.SetOutput(GinkgoWriter)
+	logger.SetErrOutput(GinkgoWriter)
 
 	RegisterFailHandler(Fail)
 	RunSpecs(t, "Providers")

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,8 @@ import (`
`19`	`19`
`20`	`20`	`func TestSessionStore(t *testing.T) {`
`21`	`21`	`logger.SetOutput(GinkgoWriter)`
	`22`	`+ logger.SetErrOutput(GinkgoWriter)`
	`23`	`+`
`22`	`24`	`RegisterFailHandler(Fail)`
`23`	`25`	`RunSpecs(t, "Cookie SessionStore")`
`24`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,8 @@ import (`
`10`	`10`
`11`	`11`	`func TestPersistenceSuite(t *testing.T) {`
`12`	`12`	`logger.SetOutput(GinkgoWriter)`
	`13`	`+ logger.SetErrOutput(GinkgoWriter)`
	`14`	`+`
`13`	`15`	`RegisterFailHandler(Fail)`
`14`	`16`	`RunSpecs(t, "Persistence")`
`15`	`17`	`}`