spelling: envvars

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
pull/7258/head
Josh Soref 6 years ago
parent 6d1d622ce4
commit 710235ddca

@ -31,7 +31,7 @@ func TestRootCmd(t *testing.T) {
tests := []struct { tests := []struct {
name, args, cachePath, configPath, dataPath string name, args, cachePath, configPath, dataPath string
envars map[string]string envvars map[string]string
}{ }{
{ {
name: "defaults", name: "defaults",
@ -40,19 +40,19 @@ func TestRootCmd(t *testing.T) {
{ {
name: "with $XDG_CACHE_HOME set", name: "with $XDG_CACHE_HOME set",
args: "home", args: "home",
envars: map[string]string{xdg.CacheHomeEnvVar: "/bar"}, envvars: map[string]string{xdg.CacheHomeEnvVar: "/bar"},
cachePath: "/bar/helm", cachePath: "/bar/helm",
}, },
{ {
name: "with $XDG_CONFIG_HOME set", name: "with $XDG_CONFIG_HOME set",
args: "home", args: "home",
envars: map[string]string{xdg.ConfigHomeEnvVar: "/bar"}, envvars: map[string]string{xdg.ConfigHomeEnvVar: "/bar"},
configPath: "/bar/helm", configPath: "/bar/helm",
}, },
{ {
name: "with $XDG_DATA_HOME set", name: "with $XDG_DATA_HOME set",
args: "home", args: "home",
envars: map[string]string{xdg.DataHomeEnvVar: "/bar"}, envvars: map[string]string{xdg.DataHomeEnvVar: "/bar"},
dataPath: "/bar/helm", dataPath: "/bar/helm",
}, },
} }
@ -61,7 +61,7 @@ func TestRootCmd(t *testing.T) {
t.Run(tt.name, func(t *testing.T) { t.Run(tt.name, func(t *testing.T) {
defer ensure.HelmHome(t)() defer ensure.HelmHome(t)()
for k, v := range tt.envars { for k, v := range tt.envvars {
os.Setenv(k, v) os.Setenv(k, v)
} }

@ -29,8 +29,8 @@ func TestEnvSettings(t *testing.T) {
name string name string
// input // input
args string args string
envars map[string]string envvars map[string]string
// expected values // expected values
ns, kcontext string ns, kcontext string
@ -47,17 +47,17 @@ func TestEnvSettings(t *testing.T) {
debug: true, debug: true,
}, },
{ {
name: "with envvars set", name: "with envvars set",
envars: map[string]string{"HELM_DEBUG": "1", "HELM_NAMESPACE": "yourns"}, envvars: map[string]string{"HELM_DEBUG": "1", "HELM_NAMESPACE": "yourns"},
ns: "yourns", ns: "yourns",
debug: true, debug: true,
}, },
{ {
name: "with flags and envvars set", name: "with flags and envvars set",
args: "--debug --namespace=myns", args: "--debug --namespace=myns",
envars: map[string]string{"HELM_DEBUG": "1", "HELM_NAMESPACE": "yourns"}, envvars: map[string]string{"HELM_DEBUG": "1", "HELM_NAMESPACE": "yourns"},
ns: "myns", ns: "myns",
debug: true, debug: true,
}, },
} }
@ -65,7 +65,7 @@ func TestEnvSettings(t *testing.T) {
t.Run(tt.name, func(t *testing.T) { t.Run(tt.name, func(t *testing.T) {
defer resetEnv()() defer resetEnv()()
for k, v := range tt.envars { for k, v := range tt.envvars {
os.Setenv(k, v) os.Setenv(k, v)
} }

Loading…
Cancel
Save