@@ -78,12 +78,23 @@ func TestGetEnvStringOrDefault(t *testing.T) {
7878 for _ , tt := range tests {
7979 t .Run (tt .name , func (t * testing.T ) {
8080 // Clean up any previous value first
81- os .Unsetenv (tt .envVar )
81+ err := os .Unsetenv (tt .envVar )
82+ if err != nil {
83+ t .Errorf ("Failed to unset environment variable %s: %v" , tt .envVar , err )
84+ }
8285
8386 // Setup environment variable
8487 if tt .envValue != "" {
85- os .Setenv (tt .envVar , tt .envValue )
86- defer os .Unsetenv (tt .envVar )
88+ err = os .Setenv (tt .envVar , tt .envValue )
89+ if err != nil {
90+ t .Errorf ("Failed to set environment variable %s: %v" , tt .envVar , err )
91+ }
92+ defer func () {
93+ err := os .Unsetenv (tt .envVar )
94+ if err != nil {
95+ t .Errorf ("Failed to unset environment variable %s: %v" , tt .envVar , err )
96+ }
97+ }()
8798 }
8899
89100 result := GetEnvStringOrDefault (tt .val , tt .envVar , tt .defaultValue )
@@ -213,12 +224,23 @@ func TestGetEnvBoolIfValueAbsent(t *testing.T) {
213224 for _ , tt := range tests {
214225 t .Run (tt .name , func (t * testing.T ) {
215226 // Clean up any previous value first
216- os .Unsetenv (tt .envVar )
227+ err := os .Unsetenv (tt .envVar )
228+ if err != nil {
229+ t .Errorf ("Failed to unset environment variable %s: %v" , tt .envVar , err )
230+ }
217231
218232 // Setup environment variable
219233 if tt .envValue != "" {
220- os .Setenv (tt .envVar , tt .envValue )
221- defer os .Unsetenv (tt .envVar )
234+ err = os .Setenv (tt .envVar , tt .envValue )
235+ if err != nil {
236+ t .Errorf ("Failed to set environment variable %s: %v" , tt .envVar , err )
237+ }
238+ defer func () {
239+ err := os .Unsetenv (tt .envVar )
240+ if err != nil {
241+ t .Errorf ("Failed to unset environment variable %s: %v" , tt .envVar , err )
242+ }
243+ }()
222244 }
223245
224246 result := GetEnvBoolIfValueAbsent (tt .val , tt .envVar )
0 commit comments