From f36dd4013c9f3d895b99fa15def2e53dfd395176 Mon Sep 17 00:00:00 2001 From: Tejal Desai Date: Thu, 7 Nov 2019 15:17:25 -0800 Subject: [PATCH] only add tests --- pkg/commands/run.go | 5 +---- pkg/commands/run_test.go | 12 ++++++------ 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/pkg/commands/run.go b/pkg/commands/run.go index 2e4aa3f36..fe8d4b27e 100644 --- a/pkg/commands/run.go +++ b/pkg/commands/run.go @@ -141,10 +141,7 @@ func addDefaultHOME(u string, envs []string) []string { home := fmt.Sprintf("%s=/", constants.HOME) userObj, err := userLookup(u) if err == nil { - u = userObj.HomeDir - if u == "" { - u = userObj.Username - } + u = userObj.Username home = fmt.Sprintf("%s=/home/%s", constants.HOME, u) } diff --git a/pkg/commands/run_test.go b/pkg/commands/run_test.go index f65c0e9e3..8640f57e4 100644 --- a/pkg/commands/run_test.go +++ b/pkg/commands/run_test.go @@ -43,7 +43,7 @@ func Test_addDefaultHOME(t *testing.T) { }, }, { - name: "HOME isn't set, user isn't set", + name: "HOME not set, user not set", user: "", initial: []string{ "PATH=/something/else", @@ -54,7 +54,7 @@ func Test_addDefaultHOME(t *testing.T) { }, }, { - name: "HOME isn't set, user and homedir for the user set", + name: "HOME not set, user and homedir for the user set", user: "www-add", mockUser: &user.User{ Username: "www-add", @@ -65,11 +65,11 @@ func Test_addDefaultHOME(t *testing.T) { }, expected: []string{ "PATH=/something/else", - "HOME=/home/some-other", + "HOME=/home/www-add", }, }, { - name: "HOME isn't set, user set", + name: "HOME not set, user set", user: "www-add", mockUser: &user.User{ Username: "www-add", @@ -83,7 +83,7 @@ func Test_addDefaultHOME(t *testing.T) { }, }, { - name: "HOME isn't set, user is set", + name: "HOME not set, user is set", user: "newuser", mockUser: &user.User{ Username: "newuser", @@ -97,7 +97,7 @@ func Test_addDefaultHOME(t *testing.T) { }, }, { - name: "HOME isn't set, user is set to root", + name: "HOME not set, user is set to root", user: "root", mockUser: &user.User{ Username: "root",