From 47739abb300fb69b1a2ca2f7767f133ad1c0d1e7 Mon Sep 17 00:00:00 2001 From: Filipe Brandenburger Date: Wed, 28 Jan 2015 20:23:06 -0800 Subject: [PATCH] Make it possible to re-enable color output in Ginkgo e2e tests Instead of forcing the NoColor flag to on at runtime, make it default to being on in a way that it's still possible to override it by passing e2e the --ginkgo.noColor=false command-line flag. Tested by running the tests with and without the flag and confirming that both worked as expected. --- test/e2e/driver.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/test/e2e/driver.go b/test/e2e/driver.go index 95ca1643b5c..e6e0f3ca9c5 100644 --- a/test/e2e/driver.go +++ b/test/e2e/driver.go @@ -30,6 +30,12 @@ import ( type testResult bool +func init() { + // Turn off colors by default to make it easier to collect console output in Jenkins + // Override colors off with --ginkgo.noColor=false in the command-line + config.DefaultReporterConfig.NoColor = true +} + func (t *testResult) Fail() { *t = false } // Run each Go end-to-end-test. This function assumes the @@ -57,8 +63,6 @@ func RunE2ETests(authConfig, certDir, host, repoRoot, provider string, orderseed var passed testResult = true gomega.RegisterFailHandler(ginkgo.Fail) - // Turn of colors for now to make it easier to collect console output in Jenkins - config.DefaultReporterConfig.NoColor = true var r []ginkgo.Reporter if reportDir != "" { // TODO: When we start using parallel tests we need to change this to "junit_%d.xml",