VAULT-1618 Move cancel and server stop into defer in tests

hashicorp · Mar 10, 2022 · b13ad32 · b13ad32
1 parent 6362c68
commit b13ad32
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/command/agent/template/template_test.go b/command/agent/template/template_test.go
@@ -435,6 +435,7 @@ func TestNewServerLogLevels(t *testing.T) {
 			if server == nil {
 				t.Fatal("nil server returned")
 			}
+			defer server.Stop()
 
 			templateTokenCh := make(chan string, 1)
 
@@ -446,6 +447,7 @@ func TestNewServerLogLevels(t *testing.T) {
 			templatesToRender := []*ctconfig.TemplateConfig{templateTest}
 
 			ctx, cancel := context.WithTimeout(context.Background(), 20*time.Second)
+			defer cancel()
 
 			errCh := make(chan error)
 			go func() {
@@ -463,8 +465,6 @@ func TestNewServerLogLevels(t *testing.T) {
 					t.Fatalf("did not expect error, got: %v", err)
 				}
 			}
-			cancel()
-			server.Stop()
 		})
 	}
 }