fix: Revert bad cleanup changes

mafredri · mafredri · commit b62487186709 · 2022-07-25T17:45:29.000+03:00
diff --git a/coderd/workspaceapps_test.go b/coderd/workspaceapps_test.go
@@ -24,16 +24,16 @@ func TestWorkspaceAppsProxyPath(t *testing.T) {
 	// #nosec
 	ln, err := net.Listen("tcp", ":0")
 	require.NoError(t, err)
-	defer func() {
-		_ = ln.Close()
-	}()
 	server := http.Server{
 		Handler: http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 			w.WriteHeader(http.StatusOK)
 		}),
 	}
+	t.Cleanup(func() {
+		_ = server.Close()
+		_ = ln.Close()
+	})
 	go server.Serve(ln)
-	defer server.Close()
 	tcpAddr, _ := ln.Addr().(*net.TCPAddr)
 
 	client := coderdtest.New(t, &coderdtest.Options{
@@ -78,9 +78,9 @@ func TestWorkspaceAppsProxyPath(t *testing.T) {
 	agentCloser := agent.New(agentClient.ListenWorkspaceAgent, &agent.Options{
 		Logger: slogtest.Make(t, nil),
 	})
-	defer func() {
+	t.Cleanup(func() {
 		_ = agentCloser.Close()
-	}()
+	})
 	coderdtest.AwaitWorkspaceAgents(t, client, workspace.LatestBuild.ID)
 	client.HTTPClient.CheckRedirect = func(req *http.Request, via []*http.Request) error {
 		return http.ErrUseLastResponse
diff --git a/provisioner/echo/serve_test.go b/provisioner/echo/serve_test.go
@@ -25,11 +25,11 @@ func TestEcho(t *testing.T) {
 	// Create an in-memory provisioner to communicate with.
 	client, server := provisionersdk.TransportPipe()
 	ctx, cancelFunc := context.WithCancel(context.Background())
-	defer func() {
+	t.Cleanup(func() {
 		_ = client.Close()
 		_ = server.Close()
 		cancelFunc()
-	}()
+	})
 	go func() {
 		err := echo.Serve(ctx, fs, &provisionersdk.ServeOptions{
 			Listener: server,
diff --git a/provisioner/terraform/parse_test.go b/provisioner/terraform/parse_test.go
@@ -23,11 +23,11 @@ func TestParse(t *testing.T) {
 	// Create an in-memory provisioner to communicate with.
 	client, server := provisionersdk.TransportPipe()
 	ctx, cancelFunc := context.WithCancel(context.Background())
-	defer func() {
+	t.Cleanup(func() {
 		_ = client.Close()
 		_ = server.Close()
 		cancelFunc()
-	}()
+	})
 	go func() {
 		err := terraform.Serve(ctx, &terraform.ServeOptions{
 			ServeOptions: &provisionersdk.ServeOptions{
