@@ -103,7 +103,9 @@ func isolateViper(t *testing.T) {
103103 if strings .HasPrefix (env , "AGENTAPI_" ) {
104104 parts := strings .SplitN (env , "=" , 2 )
105105 agentapiEnvs = append (agentapiEnvs , parts [0 ])
106- os .Unsetenv (parts [0 ])
106+ if err := os .Unsetenv (parts [0 ]); err != nil {
107+ t .Fatalf ("Failed to unset env var %s: %v" , parts [0 ], err )
108+ }
107109 }
108110 }
109111
@@ -117,7 +119,9 @@ func isolateViper(t *testing.T) {
117119 // Restore env vars
118120 for _ , key := range agentapiEnvs {
119121 if val := os .Getenv (key ); val != "" {
120- os .Setenv (key , val )
122+ if err := os .Setenv (key , val ); err != nil {
123+ t .Fatalf ("Failed to set env var %s: %v" , key , err )
124+ }
121125 }
122126 }
123127 })
@@ -148,7 +152,9 @@ func TestServerCmd_AllArgs_Defaults(t *testing.T) {
148152
149153 // Execute with no args to get defaults
150154 serverCmd .SetArgs ([]string {"--help" }) // Use help to avoid actual execution
151- serverCmd .Execute ()
155+ if err := serverCmd .Execute (); err != nil {
156+ t .Fatalf ("Failed to execute server command: %v" , err )
157+ }
152158
153159 assert .Equal (t , tt .expected , tt .getter ())
154160 })
@@ -174,15 +180,16 @@ func TestServerCmd_AllEnvVars(t *testing.T) {
174180 for _ , tt := range tests {
175181 t .Run (tt .name , func (t * testing.T ) {
176182 isolateViper (t )
177- os .Setenv (tt .envVar , tt .envValue )
178- defer os .Unsetenv (tt .envVar )
183+ t .Setenv (tt .envVar , tt .envValue )
179184
180185 serverCmd := CreateServerCmd ()
181186 cmd := & cobra.Command {}
182187 cmd .AddCommand (serverCmd )
183188
184189 serverCmd .SetArgs ([]string {"--help" })
185- serverCmd .Execute ()
190+ if err := serverCmd .Execute (); err != nil {
191+ t .Fatalf ("Failed to execute server command: %v" , err )
192+ }
186193
187194 assert .Equal (t , tt .expected , tt .getter ())
188195 })
@@ -245,14 +252,15 @@ func TestServerCmd_ArgsPrecedenceOverEnv(t *testing.T) {
245252 for _ , tt := range tests {
246253 t .Run (tt .name , func (t * testing.T ) {
247254 isolateViper (t )
248- os .Setenv (tt .envVar , tt .envValue )
249- defer os .Unsetenv (tt .envVar )
255+ t .Setenv (tt .envVar , tt .envValue )
250256
251257 // Mock execution to test arg parsing without running server
252258 args := append (tt .args , "--help" )
253259 serverCmd := CreateServerCmd ()
254260 serverCmd .SetArgs (args )
255- serverCmd .Execute ()
261+ if err := serverCmd .Execute (); err != nil {
262+ t .Fatalf ("Failed to execute server command: %v" , err )
263+ }
256264
257265 assert .Equal (t , tt .expected , tt .getter ())
258266 })
@@ -264,15 +272,15 @@ func TestMixed_ConfigurationScenarios(t *testing.T) {
264272 isolateViper (t )
265273
266274 // 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" )
275+ t .Setenv ("AGENTAPI_TYPE" , "goose" )
276+ t .Setenv ("AGENTAPI_TERM_WIDTH" , "120" )
271277
272278 // Set some CLI args
273279 serverCmd := CreateServerCmd ()
274280 serverCmd .SetArgs ([]string {"--port" , "9999" , "--print-openapi" , "--help" })
275- serverCmd .Execute ()
281+ if err := serverCmd .Execute (); err != nil {
282+ t .Fatalf ("Failed to execute server command: %v" , err )
283+ }
276284
277285 // Verify mixed configuration
278286 assert .Equal (t , "goose" , viper .GetString (FlagType )) // from env
0 commit comments