From c6143edb4425cb59266dea30bc85877a49355aa6 Mon Sep 17 00:00:00 2001 From: ᴜɴᴋɴᴡᴏɴ Date: Wed, 19 Aug 2020 21:30:01 +0800 Subject: osutil: update docstring and tests (#6255) --- internal/osutil/osutil_test.go | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'internal/osutil/osutil_test.go') diff --git a/internal/osutil/osutil_test.go b/internal/osutil/osutil_test.go index 73a45836..65ead618 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 { -- cgit v1.2.3