From c96f1a622a4db0f6e407762be6852ea44247866d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Mon, 11 Dec 2023 18:06:40 +0200 Subject: [PATCH] Defer unsetting test env vars properly --- completions_test.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/completions_test.go b/completions_test.go index c8af7e8f6..8e1c138f5 100644 --- a/completions_test.go +++ b/completions_test.go @@ -3580,10 +3580,14 @@ func TestGetEnvConfig(t *testing.T) { // Could make env handling cleaner with t.Setenv with Go >= 1.17 func() { err := os.Setenv(tc.cmdVar, tc.cmdVal) - defer assertNoErr(t, os.Unsetenv(tc.cmdVar)) + defer func() { + assertNoErr(t, os.Unsetenv(tc.cmdVar)) + }() assertNoErr(t, err) err = os.Setenv(tc.globalVar, tc.globalVal) - defer assertNoErr(t, os.Unsetenv(tc.globalVar)) + defer func() { + assertNoErr(t, os.Unsetenv(tc.globalVar)) + }() assertNoErr(t, err) cmd := &Command{Use: tc.use} got := getEnvConfig(cmd, tc.suffix)