1 files changed, 22 insertions, 30 deletions
diff --git a/client/go/cmd/version_test.go b/client/go/cmd/version_test.go
index 9c05b130e84..b78c66c9e7f 100644
--- a/client/go/cmd/version_test.go
+++ b/client/go/cmd/version_test.go
@@ -2,52 +2,44 @@
 package cmd
 
 import (
-	"fmt"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/vespa-engine/vespa/client/go/mock"
-	"github.com/vespa-engine/vespa/client/go/util"
 )
 
 func TestVersion(t *testing.T) {
 	c := &mock.HTTPClient{}
 	c.NextResponse(200, `[{"tag_name": "v1.2.3", "published_at": "2021-09-10T12:00:00Z"}]`)
-	util.ActiveHttpClient = c
 
-	sp = &mockSubprocess{}
-	out, _ := execute(command{args: []string{"version"}}, t, nil)
-	assert.Contains(t, out, "vespa version 0.0.0-devel compiled with")
-	assert.Contains(t, out, "New release available: 1.2.3\nhttps://github.com/vespa-engine/vespa/releases/tag/v1.2.3")
+	sp := &mock.Exec{}
+	cli, stdout, stderr := newTestCLI(t)
+	cli.httpClient = c
+	cli.exec = sp
+	cli.isTerminal = func() bool { return true }
+	if err := cli.Run("version", "--color", "never"); err != nil {
+		t.Fatal(err)
+	}
+	assert.Equal(t, "", stderr.String())
+	assert.Contains(t, stdout.String(), "vespa version 0.0.0-devel compiled with")
+	assert.Contains(t, stdout.String(), "New release available: 1.2.3\nhttps://github.com/vespa-engine/vespa/releases/tag/v1.2.3")
 }
 
 func TestVersionCheckHomebrew(t *testing.T) {
 	c := &mock.HTTPClient{}
 	c.NextResponse(200, `[{"tag_name": "v1.2.3", "published_at": "2021-09-10T12:00:00Z"}]`)
-	util.ActiveHttpClient = c
 
-	sp = &mockSubprocess{programPath: "/usr/local/bin/vespa", output: "/usr/local"}
-	out, _ := execute(command{args: []string{"version"}}, t, nil)
-	assert.Contains(t, out, "vespa version 0.0.0-devel compiled with")
-	assert.Contains(t, out, "New release available: 1.2.3\n"+
+	sp := &mock.Exec{ProgramPath: "/usr/local/bin/vespa", CombinedOutput: "/usr/local"}
+	cli, stdout, stderr := newTestCLI(t)
+	cli.httpClient = c
+	cli.exec = sp
+	cli.isTerminal = func() bool { return true }
+	if err := cli.Run("version", "--color", "never"); err != nil {
+		t.Fatal(err)
+	}
+	assert.Equal(t, "", stderr.String())
+	assert.Contains(t, stdout.String(), "vespa version 0.0.0-devel compiled with")
+	assert.Contains(t, stdout.String(), "New release available: 1.2.3\n"+
 		"https://github.com/vespa-engine/vespa/releases/tag/v1.2.3\n"+
 		"\nUpgrade by running:\nbrew update && brew upgrade vespa-cli\n")
 }
-
-type mockSubprocess struct {
-	programPath string
-	output      string
-}
-
-func (c *mockSubprocess) pathOf(name string) (string, error) {
-	if c.programPath == "" {
-		return "", fmt.Errorf("no program path set in this mock")
-	}
-	return c.programPath, nil
-}
-
-func (c *mockSubprocess) outputOf(name string, args ...string) ([]byte, error) {
-	return []byte(c.output), nil
-}
-
-func (c *mockSubprocess) isTerminal() bool { return true }