Merge pull request #34 from bpineau/glog_dont_log_to_tmp

Prevent glog from writing to /tmp during tests
bpineau · Apr 19, 2018 · 6cf8a82 · 6cf8a82
2 parents 0db2752 + b0949cb
commit 6cf8a82
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/cmd/execute.go b/cmd/execute.go
@@ -104,10 +104,10 @@ func init() {
 		log.Fatal("Failed to bind cli argument:", err)
 	}
 
-	RootCmd.PersistentFlags().BoolVarP(&dryRun, "dry-run", "d", false, "Dry-run mode: don't store anything.")
+	RootCmd.PersistentFlags().BoolVarP(&dryRun, "dry-run", "d", false, "Dry-run mode: don't store anything")
 	bindPFlag("dry-run", "dry-run")
 
-	RootCmd.PersistentFlags().BoolVarP(&dumpMode, "dump-only", "m", false, "Dump mode: dump everything and exit")
+	RootCmd.PersistentFlags().BoolVarP(&dumpMode, "dump-only", "m", false, "Dump mode: dump everything once and exit")
 	bindPFlag("dump-only", "dump-only")
 
 	RootCmd.PersistentFlags().StringVarP(&logLevel, "log-level", "v", "info", "Log level")

diff --git a/pkg/controller/controller_test.go b/pkg/controller/controller_test.go
@@ -1,6 +1,7 @@
 package controller
 
 import (
+	"flag"
 	"strings"
 	"testing"
 	"time"
@@ -73,6 +74,7 @@ var (
 )
 
 func TestController(t *testing.T) {
+	flag.Lookup("logtostderr").Value.Set("true")
 
 	conf := &config.KfConfig{
 		Logger:        log.New("info", "", "test"),