USEFULL
/
gogs
mirror of https://github.com/gogs/gogs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

osutil: update docstring and tests (#6255)

pull/6113/merge
ᴜɴᴋɴᴡᴏɴ 2020-08-19 21:30:01 +08:00 committed by GitHub
parent 252d0fd977
commit c6143edb44
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/osutil/osutil.go
View File

@ -34,7 +34,7 @@ func IsExist(path string) bool {
return err == nil || os.IsExist(err) return err == nil || os.IsExist(err)
} }
// CurrentUsername returns the current system user // CurrentUsername returns the username of the current user.
func CurrentUsername() string { func CurrentUsername() string {
username := os.Getenv("USER") username := os.Getenv("USER")
if len(username) > 0 { if len(username) > 0 {

12
internal/osutil/osutil_test.go
View File

@ -81,16 +81,10 @@ func TestIsExist(t *testing.T) {
} }
func TestCurrentUsername(t *testing.T) { func TestCurrentUsername(t *testing.T) {
// Make sure it does not blow up if oldUser, ok := os.LookupEnv("USER"); ok {
CurrentUsername() defer func() { _ = os.Setenv("USER", oldUser) }()
}
func TestCurrentUsernamePrefersEnvironmentVariable(t *testing.T) {
// Some users/scripts expect that they can change the current username via environment variables
if userBak, ok := os.LookupEnv("USER"); ok {
defer os.Setenv("USER", userBak)
} else { } else {
defer os.Unsetenv("USER") defer func() { _ = os.Unsetenv("USER") }()
} }
if err := os.Setenv("USER", "__TESTING::USERNAME"); err != nil { if err := os.Setenv("USER", "__TESTING::USERNAME"); err != nil {