summaryrefslogtreecommitdiffstats
path: root/client
diff options
context:
space:
mode:
authorArne Juul <arnej@yahooinc.com>2022-08-29 09:40:34 +0000
committerArne Juul <arnej@yahooinc.com>2022-08-29 09:40:34 +0000
commit561b8daf9761088039b1b66a3bb897c1dd3fd7ef (patch)
tree1c3b78ba886c0043e9abacc939116fefaefad6d2 /client
parent4a440fab85fceaa35185ec5840b7064b9f484799 (diff)
use t.Setenv() in tests
Diffstat (limited to 'client')
-rw-r--r--client/go/vespa/detect_hostname_test.go2
-rw-r--r--client/go/vespa/load_env_test.go16
2 files changed, 9 insertions, 9 deletions
diff --git a/client/go/vespa/detect_hostname_test.go b/client/go/vespa/detect_hostname_test.go
index 2692abae4d2..398626b708f 100644
--- a/client/go/vespa/detect_hostname_test.go
+++ b/client/go/vespa/detect_hostname_test.go
@@ -11,7 +11,7 @@ import (
)
func TestDetectHostname(t *testing.T) {
- os.Setenv("VESPA_HOSTNAME", "foo.bar")
+ t.Setenv("VESPA_HOSTNAME", "foo.bar")
got, err := FindOurHostname()
assert.Equal(t, "foo.bar", got)
os.Unsetenv("VESPA_HOSTNAME")
diff --git a/client/go/vespa/load_env_test.go b/client/go/vespa/load_env_test.go
index e3683b0ecdb..41373f7ab82 100644
--- a/client/go/vespa/load_env_test.go
+++ b/client/go/vespa/load_env_test.go
@@ -16,15 +16,15 @@ func setup(t *testing.T, contents string) {
envf := cdir + "/default-env.txt"
err := os.MkdirAll(cdir, 0755)
assert.Nil(t, err)
- os.Setenv("VESPA_HOME", vdir)
+ t.Setenv("VESPA_HOME", vdir)
err = os.WriteFile(envf, []byte(contents), 0644)
assert.Nil(t, err)
}
func TestLoadEnvSimple(t *testing.T) {
- os.Setenv("VESPA_FOO", "was foo")
- os.Setenv("VESPA_BAR", "was bar")
- os.Setenv("VESPA_FOOBAR", "foobar")
+ t.Setenv("VESPA_FOO", "was foo")
+ t.Setenv("VESPA_BAR", "was bar")
+ t.Setenv("VESPA_FOOBAR", "foobar")
os.Unsetenv("VESPA_QUUX")
setup(t, `
# vespa env vars file
@@ -117,10 +117,10 @@ override VESPA_USER unprivuser
}
func TestExportEnv(t *testing.T) {
- os.Setenv("VESPA_FOO", "was foo")
- os.Setenv("VESPA_BAR", "was bar")
- os.Setenv("VESPA_FOOBAR", "foobar")
- os.Setenv("VESPA_BARFOO", "was barfoo")
+ t.Setenv("VESPA_FOO", "was foo")
+ t.Setenv("VESPA_BAR", "was bar")
+ t.Setenv("VESPA_FOOBAR", "foobar")
+ t.Setenv("VESPA_BARFOO", "was barfoo")
os.Unsetenv("VESPA_QUUX")
setup(t, `
# vespa env vars file