Defer unsetting test env vars properly

This commit is contained in:
Ville Skyttä 2023-12-11 18:06:40 +02:00
parent 138b0ab964
commit c96f1a622a

View file

@ -3580,10 +3580,14 @@ func TestGetEnvConfig(t *testing.T) {
// Could make env handling cleaner with t.Setenv with Go >= 1.17 // Could make env handling cleaner with t.Setenv with Go >= 1.17
func() { func() {
err := os.Setenv(tc.cmdVar, tc.cmdVal) 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) assertNoErr(t, err)
err = os.Setenv(tc.globalVar, tc.globalVal) 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) assertNoErr(t, err)
cmd := &Command{Use: tc.use} cmd := &Command{Use: tc.use}
got := getEnvConfig(cmd, tc.suffix) got := getEnvConfig(cmd, tc.suffix)