Test-only tech-debt cleanup: Make TestCtx use stdlib testing.Context() instead of a DIY version (#7669)

bbrks · web-flow · commit 6396718d1539 · 2025-08-07T15:06:55.000+01:00
diff --git a/base/logging_context.go b/base/logging_context.go
@@ -176,9 +176,7 @@ func NewTaskID(contextID string, taskName string) string {
 
 // TestCtx creates a context for the given test which is also cancelled once the test has completed.
 func TestCtx(t testing.TB) context.Context {
-	ctx, cancelCtx := context.WithCancel(context.Background())
-	t.Cleanup(cancelCtx)
-	return LogContextWith(ctx, &LogContext{TestName: t.Name()})
+	return LogContextWith(t.Context(), &LogContext{TestName: t.Name()})
 }
 
 // BucketCtx extends the parent context with a bucket name.

Original file line number	Diff line number	Diff line change
`@@ -176,9 +176,7 @@ func NewTaskID(contextID string, taskName string) string {`
`176`	`176`
`177`	`177`	`// TestCtx creates a context for the given test which is also cancelled once the test has completed.`
`178`	`178`	`func TestCtx(t testing.TB) context.Context {`
`179`		`- ctx, cancelCtx := context.WithCancel(context.Background())`
`180`		`- t.Cleanup(cancelCtx)`
`181`		`- return LogContextWith(ctx, &LogContext{TestName: t.Name()})`
	`179`	`+ return LogContextWith(t.Context(), &LogContext{TestName: t.Name()})`
`182`	`180`	`}`
`183`	`181`
`184`	`182`	`// BucketCtx extends the parent context with a bucket name.`