cybercyst/go
1
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-05-05 15:43:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

os: allow $HOME to not exist in TestUserHomeDir

Browse Source 
This seems like a cleaner fix for the situation Debian has patched
around with
https://sources.debian.org/patches/golang-1.19/1.19.3-1/0001-Disable-test-for-UserHomeDir.patch/

Tested with 'GOCACHE=$(go env GOCACHE) HOME=/home/nobody go test os'.

Change-Id: I9fd00da38b86df2edfcd8cb87629e2875573903e
Reviewed-on: https://go-review.googlesource.com/c/go/+/456126
Run-TryBot: Bryan Mills <bcmills@google.com>
Reviewed-by: Russ Cox <rsc@golang.org>
Reviewed-by: Rob Pike <r@golang.org>
Reviewed-by: Ian Lance Taylor <iant@google.com>
Auto-Submit: Bryan Mills <bcmills@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
This commit is contained in:
Bryan C. Mills 2022-12-08 14:10:59 -05:00 committed by Gopher Robot
parent dfd2ddd671
commit bb4ea80bef
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/os/file.go
View File

@ -486,6 +486,9 @@ func UserConfigDir() (string, error) {
// On Unix, including macOS, it returns the $HOME environment variable.
// On Windows, it returns %USERPROFILE%.
// On Plan 9, it returns the $home environment variable.
//
// If the expected variable is not set in the environment, UserHomeDir
// returns either a platform-specific default value or a non-nil error.
func UserHomeDir() (string, error) {
env, enverr := "HOME", "$HOME"
switch runtime.GOOS {

12
src/os/os_test.go
View File

@ -2639,10 +2639,20 @@ func TestUserHomeDir(t *testing.T) {
t.Fatal("UserHomeDir returned an empty string but no error")
}
if err != nil {
t.Skipf("UserHomeDir failed: %v", err)
// UserHomeDir may return a non-nil error if the environment variable
// for the home directory is empty or unset in the environment.
t.Skipf("skipping: %v", err)
}
fi, err := Stat(dir)
if err != nil {
if os.IsNotExist(err) {
// The user's home directory has a well-defined location, but does not
// exist. (Maybe nothing has written to it yet? That could happen, for
// example, on minimal VM images used for CI testing.)
t.Log(err)
return
}
t.Fatal(err)
}
if !fi.IsDir() {