Less test noise

5 files changed, 23 insertions, 19 deletions

diff --git a/client/go/internal/vespa/detect_hostname_test.go b/client/go/internal/vespa/detect_hostname_test.go
index 324701efb6f..26b3095dbf6 100644
--- a/client/go/internal/vespa/detect_hostname_test.go
+++ b/client/go/internal/vespa/detect_hostname_test.go
@@ -2,7 +2,6 @@
 package vespa
 
 import (
-	"fmt"
 	"os"
 	"strings"
 	"testing"
@@ -19,15 +18,15 @@ func TestDetectHostname(t *testing.T) {
 	assert.Equal(t, "foo.bar", got)
 	os.Unsetenv("VESPA_HOSTNAME")
 	got, err = findOurHostnameFrom("bar.foo.123")
-	fmt.Fprintln(os.Stderr, "findOurHostname from bar.foo.123 returns:", got, "with error:", err)
+	t.Log("findOurHostname from bar.foo.123 returns:", got, "with error:", err)
 	assert.NotEqual(t, "", got)
 	parts := strings.Split(got, ".")
 	if len(parts) > 1 {
 		expanded, err2 := findOurHostnameFrom(parts[0])
-		fmt.Fprintln(os.Stderr, "findOurHostname from", parts[0], "returns:", expanded, "with error:", err2)
+		t.Log("findOurHostname from", parts[0], "returns:", expanded, "with error:", err2)
 		assert.Equal(t, got, expanded)
 	}
 	got, err = findOurHostnameFrom("")
 	assert.NotEqual(t, "", got)
-	fmt.Fprintln(os.Stderr, "findOurHostname('') returns:", got, "with error:", err)
+	t.Log("findOurHostname('') returns:", got, "with error:", err)
 }
diff --git a/client/go/internal/vespa/find_user_test.go b/client/go/internal/vespa/find_user_test.go
index 3d533b08c56..484a9a9cc2c 100644
--- a/client/go/internal/vespa/find_user_test.go
+++ b/client/go/internal/vespa/find_user_test.go
@@ -2,8 +2,6 @@
 package vespa
 
 import (
-	"fmt"
-	"os"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -23,5 +21,5 @@ func TestFindVespaUser(t *testing.T) {
 
 func TestFindVespaUidAndGid(t *testing.T) {
 	uid, gid := FindVespaUidAndGid()
-	fmt.Fprintln(os.Stderr, "INFO: result from FindVespaUidAndGid() is", uid, "and", gid)
+	t.Log("INFO: result from FindVespaUidAndGid() is", uid, "and", gid)
 }
diff --git a/client/go/internal/vespa/load_env.go b/client/go/internal/vespa/load_env.go
index 6c41c1fece5..87d60738366 100644
--- a/client/go/internal/vespa/load_env.go
+++ b/client/go/internal/vespa/load_env.go
@@ -8,6 +8,7 @@ import (
 	"bufio"
 	"errors"
 	"fmt"
+	"io"
 	"os"
 	"strings"
 
@@ -29,13 +30,15 @@ func LoadDefaultEnv() error {
 }
 
 // parse default-env.txt, then dump export statements for "sh" to stdout
-func ExportDefaultEnvToSh() error {
+func ExportDefaultEnvToSh() error { return ExportDefaultEnvTo(os.Stdout) }
+
+func ExportDefaultEnvTo(w io.Writer) error {
 	holder := newShellEnvExporter()
 	err := loadDefaultEnvTo(holder)
 	holder.fallbackVar(envvars.VESPA_HOME, FindHome())
 	holder.fallbackVar(envvars.VESPA_USER, FindVespaUser())
 	ensureGoodPath(holder)
-	holder.dump()
+	holder.dump(w)
 	return err
 }
 
@@ -250,13 +253,13 @@ func shellQuote(s string) string {
 	return string(res)
 }
 
-func (p *shellEnvExporter) dump() {
+func (p *shellEnvExporter) dump(w io.Writer) {
 	for vn, vv := range p.exportVars {
-		fmt.Printf("%s=%s\n", vn, vv)
-		fmt.Printf("export %s\n", vn)
+		fmt.Fprintf(w, "%s=%s\n", vn, vv)
+		fmt.Fprintf(w, "export %s\n", vn)
 	}
 	for vn, _ := range p.unsetVars {
-		fmt.Printf("unset %s\n", vn)
+		fmt.Fprintf(w, "unset %s\n", vn)
 	}
 }
 
diff --git a/client/go/internal/vespa/load_env_test.go b/client/go/internal/vespa/load_env_test.go
index 8c3ef3ab3ab..b5903c50397 100644
--- a/client/go/internal/vespa/load_env_test.go
+++ b/client/go/internal/vespa/load_env_test.go
@@ -2,7 +2,7 @@
 package vespa
 
 import (
-	"fmt"
+	"io"
 	"os"
 	"strings"
 	"testing"
@@ -112,9 +112,9 @@ override VESPA_V2 v2
 func TestFindUser(t *testing.T) {
 	u := FindVespaUser()
 	if u == "" {
-		fmt.Fprintln(os.Stderr, "WARNING: empty result from FindVespaUser()")
+		t.Log("WARNING: empty result from FindVespaUser()")
 	} else {
-		fmt.Fprintln(os.Stderr, "INFO: result from FindVespaUser() is", u)
+		t.Log("INFO: result from FindVespaUser() is", u)
 		assert.Equal(t, u, os.Getenv("VESPA_USER"))
 	}
 	setup(t, `
@@ -166,7 +166,11 @@ unset XYZ
 	assert.Equal(t, 4, len(holder.exportVars))
 	assert.Equal(t, 2, len(holder.unsetVars))
 	// run it
-	err = ExportDefaultEnvToSh()
+	w := io.Discard
+	if testing.Verbose() {
+		w = os.Stdout
+	}
+	err = ExportDefaultEnvTo(w)
 	assert.Nil(t, err)
 }
 
@@ -177,7 +181,7 @@ func TestLoadEnvNop(t *testing.T) {
 	assert.Nil(t, err)
 	// check results
 	path := os.Getenv("PATH")
-	fmt.Println("got path:", path)
+	t.Log("got path:", path)
 	assert.True(t, strings.Contains(path, td+"/vespa/bin:"))
 	assert.True(t, strings.Contains(path, ":"+td))
 }
diff --git a/client/go/internal/vespa/tls_options.go b/client/go/internal/vespa/tls_options.go
index 6d5657f49e7..2578116ef68 100644
--- a/client/go/internal/vespa/tls_options.go
+++ b/client/go/internal/vespa/tls_options.go
@@ -62,5 +62,5 @@ func ExportSecurityEnvToSh() {
 			helper.overrideVar(envvars.VESPA_TLS_ENABLED, "1")
 		}
 	}
-	helper.dump()
+	helper.dump(os.Stdout)
 }