@@ -117,7 +117,7 @@ func isolateViper(t *testing.T) {
117117 // Restore env vars
118118 for _ , key := range agentapiEnvs {
119119 if val := os .Getenv (key ); val != "" {
120- os .Setenv (key , val )
120+ t .Setenv (key , val )
121121 }
122122 }
123123 })
@@ -174,8 +174,7 @@ func TestServerCmd_AllEnvVars(t *testing.T) {
174174 for _ , tt := range tests {
175175 t .Run (tt .name , func (t * testing.T ) {
176176 isolateViper (t )
177- os .Setenv (tt .envVar , tt .envValue )
178- defer os .Unsetenv (tt .envVar )
177+ t .Setenv (tt .envVar , tt .envValue )
179178
180179 serverCmd := CreateServerCmd ()
181180 cmd := & cobra.Command {}
@@ -245,8 +244,7 @@ func TestServerCmd_ArgsPrecedenceOverEnv(t *testing.T) {
245244 for _ , tt := range tests {
246245 t .Run (tt .name , func (t * testing.T ) {
247246 isolateViper (t )
248- os .Setenv (tt .envVar , tt .envValue )
249- defer os .Unsetenv (tt .envVar )
247+ t .Setenv (tt .envVar , tt .envValue )
250248
251249 // Mock execution to test arg parsing without running server
252250 args := append (tt .args , "--help" )
@@ -264,10 +262,8 @@ func TestMixed_ConfigurationScenarios(t *testing.T) {
264262 isolateViper (t )
265263
266264 // Set some env vars
267- os .Setenv ("AGENTAPI_TYPE" , "goose" )
268- os .Setenv ("AGENTAPI_TERM_WIDTH" , "120" )
269- defer os .Unsetenv ("AGENTAPI_TYPE" )
270- defer os .Unsetenv ("AGENTAPI_TERM_WIDTH" )
265+ t .Setenv ("AGENTAPI_TYPE" , "goose" )
266+ t .Setenv ("AGENTAPI_TERM_WIDTH" , "120" )
271267
272268 // Set some CLI args
273269 serverCmd := CreateServerCmd ()
0 commit comments