fix: Run ctx cancel first in t.Cleanup

mafredri · mafredri · commit 1fa151c7a854 · 2022-07-22T15:54:47.000+03:00
diff --git a/coderd/coderd_test.go b/coderd/coderd_test.go
@@ -94,7 +94,7 @@ func TestAuthorizeAllEndpoints(t *testing.T) {
 		t.Cleanup(func() { close(tickerCh) })
 
 		ctx, cancelFunc := context.WithCancel(context.Background())
-		t.Cleanup(cancelFunc)
+		defer t.Cleanup(cancelFunc) // Defer to ensure cancelFunc is executed first.
 
 		lifecycleExecutor := executor.New(
 			ctx,
diff --git a/coderd/coderdtest/coderdtest.go b/coderd/coderdtest/coderdtest.go
@@ -143,7 +143,7 @@ func newWithCloser(t *testing.T, options *Options) (*codersdk.Client, io.Closer)
 	}
 
 	ctx, cancelFunc := context.WithCancel(context.Background())
-	t.Cleanup(cancelFunc)
+	defer t.Cleanup(cancelFunc) // Defer to ensure cancelFunc is executed first.
 
 	lifecycleExecutor := executor.New(
 		ctx,

Original file line number	Diff line number	Diff line change
`@@ -143,7 +143,7 @@ func newWithCloser(t testing.T, options Options) (*codersdk.Client, io.Closer)`
`143`	`143`	`}`
`144`	`144`
`145`	`145`	`ctx, cancelFunc := context.WithCancel(context.Background())`
`146`		`- t.Cleanup(cancelFunc)`
	`146`	`+ defer t.Cleanup(cancelFunc) // Defer to ensure cancelFunc is executed first.`
`147`	`147`
`148`	`148`	`lifecycleExecutor := executor.New(`
`149`	`149`	`ctx,`