fix: Ensure t.Cleanup is not aborted by require

mafredri · mafredri · commit 4f33ca82ce3f · 2022-07-22T15:11:37.000+03:00
diff --git a/cli/configssh_test.go b/cli/configssh_test.go
@@ -134,9 +134,6 @@ func TestConfigSSH(t *testing.T) {
 			go io.Copy(ssh, conn)
 		}
 	}()
-	t.Cleanup(func() {
-		_ = listener.Close()
-	})
 
 	sshConfigFile, _ := sshConfigFileNames(t)
 
diff --git a/coderd/coderd_test.go b/coderd/coderd_test.go
@@ -94,6 +94,8 @@ func TestAuthorizeAllEndpoints(t *testing.T) {
 		t.Cleanup(func() { close(tickerCh) })
 
 		ctx, cancelFunc := context.WithCancel(context.Background())
+		t.Cleanup(cancelFunc)
+
 		lifecycleExecutor := executor.New(
 			ctx,
 			db,
@@ -109,9 +111,13 @@ func TestAuthorizeAllEndpoints(t *testing.T) {
 		srv.Start()
 		serverURL, err := url.Parse(srv.URL)
 		require.NoError(t, err)
+		t.Cleanup(srv.Close)
 
 		turnServer, err := turnconn.New(nil)
 		require.NoError(t, err)
+		t.Cleanup(func() {
+			_ = turnServer.Close()
+		})
 
 		validator, err := idtoken.NewValidator(ctx, option.WithoutAuthentication())
 		require.NoError(t, err)
@@ -138,9 +144,6 @@ func TestAuthorizeAllEndpoints(t *testing.T) {
 
 		_ = coderdtest.NewProvisionerDaemon(t, coderAPI)
 		t.Cleanup(func() {
-			cancelFunc()
-			_ = turnServer.Close()
-			srv.Close()
 			_ = coderAPI.Close()
 		})
 
diff --git a/coderd/coderdtest/coderdtest.go b/coderd/coderdtest/coderdtest.go
@@ -143,6 +143,8 @@ func newWithCloser(t *testing.T, options *Options) (*codersdk.Client, io.Closer)
 	}
 
 	ctx, cancelFunc := context.WithCancel(context.Background())
+	t.Cleanup(cancelFunc)
+
 	lifecycleExecutor := executor.New(
 		ctx,
 		db,
@@ -156,6 +158,8 @@ func newWithCloser(t *testing.T, options *Options) (*codersdk.Client, io.Closer)
 		return ctx
 	}
 	srv.Start()
+	t.Cleanup(srv.Close)
+
 	serverURL, err := url.Parse(srv.URL)
 	require.NoError(t, err)
 
@@ -166,6 +170,9 @@ func newWithCloser(t *testing.T, options *Options) (*codersdk.Client, io.Closer)
 
 	turnServer, err := turnconn.New(nil)
 	require.NoError(t, err)
+	t.Cleanup(func() {
+		_ = turnServer.Close()
+	})
 
 	// We set the handler after server creation for the access URL.
 	coderAPI := coderd.New(&coderd.Options{
@@ -188,18 +195,16 @@ func newWithCloser(t *testing.T, options *Options) (*codersdk.Client, io.Closer)
 		Authorizer:           options.Authorizer,
 		Telemetry:            telemetry.NewNoop(),
 	})
+	t.Cleanup(func() {
+		_ = coderAPI.Close()
+	})
 	srv.Config.Handler = coderAPI.Handler
 
 	var provisionerCloser io.Closer = nopcloser{}
 	if options.IncludeProvisionerD {
 		provisionerCloser = NewProvisionerDaemon(t, coderAPI)
 	}
-
 	t.Cleanup(func() {
-		cancelFunc()
-		_ = turnServer.Close()
-		srv.Close()
-		_ = coderAPI.Close()
 		_ = provisionerCloser.Close()
 	})
 

Original file line number	Diff line number	Diff line change
`@@ -134,9 +134,6 @@ func TestConfigSSH(t *testing.T) {`
`134`	`134`	`go io.Copy(ssh, conn)`
`135`	`135`	`}`
`136`	`136`	`}()`
`137`		`- t.Cleanup(func() {`
`138`		`- _ = listener.Close()`
`139`		`- })`
`140`	`137`
`141`	`138`	`sshConfigFile, _ := sshConfigFileNames(t)`
`142`	`139`