Merge pull request #1039 from oauth2-proxy/fix-test-logging
Ensure errors in tests are logged to the GinkgoWriter
This commit is contained in:
		
						commit
						465789b044
					
				|  | @ -8,6 +8,8 @@ | ||||||
| 
 | 
 | ||||||
| ## Changes since v7.0.1 | ## 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 | # V7.0.1 | ||||||
| 
 | 
 | ||||||
| ## Release Highlights | ## Release Highlights | ||||||
|  |  | ||||||
|  | @ -10,6 +10,7 @@ import ( | ||||||
| 
 | 
 | ||||||
| func TestMainSuite(t *testing.T) { | func TestMainSuite(t *testing.T) { | ||||||
| 	logger.SetOutput(GinkgoWriter) | 	logger.SetOutput(GinkgoWriter) | ||||||
|  | 	logger.SetErrOutput(GinkgoWriter) | ||||||
| 
 | 
 | ||||||
| 	RegisterFailHandler(Fail) | 	RegisterFailHandler(Fail) | ||||||
| 	RunSpecs(t, "Main Suite") | 	RunSpecs(t, "Main Suite") | ||||||
|  |  | ||||||
|  | @ -13,6 +13,7 @@ import ( | ||||||
| // this functionality
 | // this functionality
 | ||||||
| func TestMiddlewareSuite(t *testing.T) { | func TestMiddlewareSuite(t *testing.T) { | ||||||
| 	logger.SetOutput(GinkgoWriter) | 	logger.SetOutput(GinkgoWriter) | ||||||
|  | 	logger.SetErrOutput(GinkgoWriter) | ||||||
| 
 | 
 | ||||||
| 	RegisterFailHandler(Fail) | 	RegisterFailHandler(Fail) | ||||||
| 	RunSpecs(t, "Middleware API") | 	RunSpecs(t, "Middleware API") | ||||||
|  |  | ||||||
|  | @ -10,6 +10,7 @@ import ( | ||||||
| 
 | 
 | ||||||
| func TestOptionsSuite(t *testing.T) { | func TestOptionsSuite(t *testing.T) { | ||||||
| 	logger.SetOutput(GinkgoWriter) | 	logger.SetOutput(GinkgoWriter) | ||||||
|  | 	logger.SetErrOutput(GinkgoWriter) | ||||||
| 
 | 
 | ||||||
| 	RegisterFailHandler(Fail) | 	RegisterFailHandler(Fail) | ||||||
| 	RunSpecs(t, "Options Suite") | 	RunSpecs(t, "Options Suite") | ||||||
|  |  | ||||||
|  | @ -10,6 +10,7 @@ import ( | ||||||
| 
 | 
 | ||||||
| func TestUtilSuite(t *testing.T) { | func TestUtilSuite(t *testing.T) { | ||||||
| 	logger.SetOutput(GinkgoWriter) | 	logger.SetOutput(GinkgoWriter) | ||||||
|  | 	logger.SetErrOutput(GinkgoWriter) | ||||||
| 
 | 
 | ||||||
| 	RegisterFailHandler(Fail) | 	RegisterFailHandler(Fail) | ||||||
| 	RunSpecs(t, "Options Util Suite") | 	RunSpecs(t, "Options Util Suite") | ||||||
|  |  | ||||||
|  | @ -10,6 +10,7 @@ import ( | ||||||
| 
 | 
 | ||||||
| func TestBasicSuite(t *testing.T) { | func TestBasicSuite(t *testing.T) { | ||||||
| 	logger.SetOutput(GinkgoWriter) | 	logger.SetOutput(GinkgoWriter) | ||||||
|  | 	logger.SetErrOutput(GinkgoWriter) | ||||||
| 
 | 
 | ||||||
| 	RegisterFailHandler(Fail) | 	RegisterFailHandler(Fail) | ||||||
| 	RunSpecs(t, "Basic") | 	RunSpecs(t, "Basic") | ||||||
|  |  | ||||||
|  | @ -17,6 +17,7 @@ var ( | ||||||
| 
 | 
 | ||||||
| func TestHeaderSuite(t *testing.T) { | func TestHeaderSuite(t *testing.T) { | ||||||
| 	logger.SetOutput(GinkgoWriter) | 	logger.SetOutput(GinkgoWriter) | ||||||
|  | 	logger.SetErrOutput(GinkgoWriter) | ||||||
| 
 | 
 | ||||||
| 	RegisterFailHandler(Fail) | 	RegisterFailHandler(Fail) | ||||||
| 	RunSpecs(t, "Header") | 	RunSpecs(t, "Header") | ||||||
|  |  | ||||||
|  | @ -11,6 +11,7 @@ import ( | ||||||
| 
 | 
 | ||||||
| func TestMiddlewareSuite(t *testing.T) { | func TestMiddlewareSuite(t *testing.T) { | ||||||
| 	logger.SetOutput(GinkgoWriter) | 	logger.SetOutput(GinkgoWriter) | ||||||
|  | 	logger.SetErrOutput(GinkgoWriter) | ||||||
| 
 | 
 | ||||||
| 	RegisterFailHandler(Fail) | 	RegisterFailHandler(Fail) | ||||||
| 	RunSpecs(t, "Middleware") | 	RunSpecs(t, "Middleware") | ||||||
|  |  | ||||||
|  | @ -21,6 +21,7 @@ var ( | ||||||
| 
 | 
 | ||||||
| func TestRequetsSuite(t *testing.T) { | func TestRequetsSuite(t *testing.T) { | ||||||
| 	logger.SetOutput(GinkgoWriter) | 	logger.SetOutput(GinkgoWriter) | ||||||
|  | 	logger.SetErrOutput(GinkgoWriter) | ||||||
| 	log.SetOutput(GinkgoWriter) | 	log.SetOutput(GinkgoWriter) | ||||||
| 
 | 
 | ||||||
| 	RegisterFailHandler(Fail) | 	RegisterFailHandler(Fail) | ||||||
|  |  | ||||||
|  | @ -13,6 +13,7 @@ import ( | ||||||
| // this functionality
 | // this functionality
 | ||||||
| func TestRequestUtilSuite(t *testing.T) { | func TestRequestUtilSuite(t *testing.T) { | ||||||
| 	logger.SetOutput(GinkgoWriter) | 	logger.SetOutput(GinkgoWriter) | ||||||
|  | 	logger.SetErrOutput(GinkgoWriter) | ||||||
| 
 | 
 | ||||||
| 	RegisterFailHandler(Fail) | 	RegisterFailHandler(Fail) | ||||||
| 	RunSpecs(t, "Request Utils") | 	RunSpecs(t, "Request Utils") | ||||||
|  |  | ||||||
|  | @ -19,6 +19,8 @@ import ( | ||||||
| 
 | 
 | ||||||
| func TestSessionStore(t *testing.T) { | func TestSessionStore(t *testing.T) { | ||||||
| 	logger.SetOutput(GinkgoWriter) | 	logger.SetOutput(GinkgoWriter) | ||||||
|  | 	logger.SetErrOutput(GinkgoWriter) | ||||||
|  | 
 | ||||||
| 	RegisterFailHandler(Fail) | 	RegisterFailHandler(Fail) | ||||||
| 	RunSpecs(t, "Cookie SessionStore") | 	RunSpecs(t, "Cookie SessionStore") | ||||||
| } | } | ||||||
|  |  | ||||||
|  | @ -10,6 +10,8 @@ import ( | ||||||
| 
 | 
 | ||||||
| func TestPersistenceSuite(t *testing.T) { | func TestPersistenceSuite(t *testing.T) { | ||||||
| 	logger.SetOutput(GinkgoWriter) | 	logger.SetOutput(GinkgoWriter) | ||||||
|  | 	logger.SetErrOutput(GinkgoWriter) | ||||||
|  | 
 | ||||||
| 	RegisterFailHandler(Fail) | 	RegisterFailHandler(Fail) | ||||||
| 	RunSpecs(t, "Persistence") | 	RunSpecs(t, "Persistence") | ||||||
| } | } | ||||||
|  |  | ||||||
|  | @ -33,6 +33,7 @@ func (l *wrappedRedisLogger) Printf(_ context.Context, format string, v ...inter | ||||||
| 
 | 
 | ||||||
| func TestSessionStore(t *testing.T) { | func TestSessionStore(t *testing.T) { | ||||||
| 	logger.SetOutput(GinkgoWriter) | 	logger.SetOutput(GinkgoWriter) | ||||||
|  | 	logger.SetErrOutput(GinkgoWriter) | ||||||
| 
 | 
 | ||||||
| 	redisLogger := &wrappedRedisLogger{Logger: log.New(os.Stderr, "redis: ", log.LstdFlags|log.Lshortfile)} | 	redisLogger := &wrappedRedisLogger{Logger: log.New(os.Stderr, "redis: ", log.LstdFlags|log.Lshortfile)} | ||||||
| 	redisLogger.SetOutput(GinkgoWriter) | 	redisLogger.SetOutput(GinkgoWriter) | ||||||
|  |  | ||||||
|  | @ -18,6 +18,7 @@ import ( | ||||||
| 
 | 
 | ||||||
| func TestSessionStore(t *testing.T) { | func TestSessionStore(t *testing.T) { | ||||||
| 	logger.SetOutput(GinkgoWriter) | 	logger.SetOutput(GinkgoWriter) | ||||||
|  | 	logger.SetErrOutput(GinkgoWriter) | ||||||
| 
 | 
 | ||||||
| 	RegisterFailHandler(Fail) | 	RegisterFailHandler(Fail) | ||||||
| 	RunSpecs(t, "SessionStore") | 	RunSpecs(t, "SessionStore") | ||||||
|  |  | ||||||
|  | @ -26,6 +26,7 @@ var ( | ||||||
| 
 | 
 | ||||||
| func TestUpstreamSuite(t *testing.T) { | func TestUpstreamSuite(t *testing.T) { | ||||||
| 	logger.SetOutput(GinkgoWriter) | 	logger.SetOutput(GinkgoWriter) | ||||||
|  | 	logger.SetErrOutput(GinkgoWriter) | ||||||
| 	log.SetOutput(GinkgoWriter) | 	log.SetOutput(GinkgoWriter) | ||||||
| 
 | 
 | ||||||
| 	RegisterFailHandler(Fail) | 	RegisterFailHandler(Fail) | ||||||
|  |  | ||||||
|  | @ -10,6 +10,7 @@ import ( | ||||||
| 
 | 
 | ||||||
| func TestValidationSuite(t *testing.T) { | func TestValidationSuite(t *testing.T) { | ||||||
| 	logger.SetOutput(GinkgoWriter) | 	logger.SetOutput(GinkgoWriter) | ||||||
|  | 	logger.SetErrOutput(GinkgoWriter) | ||||||
| 
 | 
 | ||||||
| 	RegisterFailHandler(Fail) | 	RegisterFailHandler(Fail) | ||||||
| 	RunSpecs(t, "Validation Suite") | 	RunSpecs(t, "Validation Suite") | ||||||
|  |  | ||||||
|  | @ -10,6 +10,7 @@ import ( | ||||||
| 
 | 
 | ||||||
| func TestProviderSuite(t *testing.T) { | func TestProviderSuite(t *testing.T) { | ||||||
| 	logger.SetOutput(GinkgoWriter) | 	logger.SetOutput(GinkgoWriter) | ||||||
|  | 	logger.SetErrOutput(GinkgoWriter) | ||||||
| 
 | 
 | ||||||
| 	RegisterFailHandler(Fail) | 	RegisterFailHandler(Fail) | ||||||
| 	RunSpecs(t, "Providers") | 	RunSpecs(t, "Providers") | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue