Cleanup printing and colorization

1 files changed, 6 insertions, 4 deletions

diff --git a/client/go/cmd/command_tester.go b/client/go/cmd/command_tester.go
index 50684d87a1b..6078167df40 100644
--- a/client/go/cmd/command_tester.go
+++ b/client/go/cmd/command_tester.go
@@ -6,25 +6,27 @@ package cmd
 
 import (
 	"bytes"
-	"github.com/stretchr/testify/assert"
-	"github.com/vespa-engine/vespa/util"
 	"io/ioutil"
+	"log"
 	"net/http"
 	"strconv"
 	"testing"
 	"time"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/vespa-engine/vespa/util"
 )
 
 func executeCommand(t *testing.T, client *mockHttpClient, args []string, moreArgs []string) (standardout string) {
 	util.ActiveHttpClient = client
 
 	// Reset - persistent flags in Cobra persists over tests
-	util.Out = bytes.NewBufferString("")
+	log.SetOutput(bytes.NewBufferString(""))
 	rootCmd.SetArgs([]string{"status", "-t", ""})
 	rootCmd.Execute()
 
 	b := bytes.NewBufferString("")
-	util.Out = b
+	log.SetOutput(b)
 	rootCmd.SetArgs(append(args, moreArgs...))
 	rootCmd.Execute()
 	out, err := ioutil.ReadAll(b)