From c6143edb4425cb59266dea30bc85877a49355aa6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E1=B4=9C=C9=B4=E1=B4=8B=C9=B4=E1=B4=A1=E1=B4=8F=C9=B4?= Date: Wed, 19 Aug 2020 21:30:01 +0800 Subject: [PATCH] osutil: update docstring and tests (#6255) --- internal/osutil/osutil.go | 2 +- internal/osutil/osutil_test.go | 12 +++--------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/internal/osutil/osutil.go b/internal/osutil/osutil.go index 4f8715870..b5c824557 100644 --- a/internal/osutil/osutil.go +++ b/internal/osutil/osutil.go @@ -34,7 +34,7 @@ func IsExist(path string) bool { return err == nil || os.IsExist(err) } -// CurrentUsername returns the current system user +// CurrentUsername returns the username of the current user. func CurrentUsername() string { username := os.Getenv("USER") if len(username) > 0 { diff --git a/internal/osutil/osutil_test.go b/internal/osutil/osutil_test.go index 73a45836e..65ead6189 100644 --- a/internal/osutil/osutil_test.go +++ b/internal/osutil/osutil_test.go @@ -81,16 +81,10 @@ func TestIsExist(t *testing.T) { } func TestCurrentUsername(t *testing.T) { - // Make sure it does not blow up - CurrentUsername() -} - -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) + if oldUser, ok := os.LookupEnv("USER"); ok { + defer func() { _ = os.Setenv("USER", oldUser) }() } else { - defer os.Unsetenv("USER") + defer func() { _ = os.Unsetenv("USER") }() } if err := os.Setenv("USER", "__TESTING::USERNAME"); err != nil {