testhelper: Drop cancel function from context options

There are no context options anymore which would set up a separate
way to cancel the context given that deadlines and similar things are
forbidden nowadays. As a result, the `func()` return value of context
options isn't used at all anymore.

Simplify context creation by dropping the cancel function from context
options.

1 files changed, 6 insertions, 13 deletions

diff --git a/internal/testhelper/testhelper.go b/internal/testhelper/testhelper.go
index b5b008ff8..f9f3656fd 100644
--- a/internal/testhelper/testhelper.go
+++ b/internal/testhelper/testhelper.go
@@ -157,12 +157,12 @@ func GetLocalhostListener(t testing.TB) (net.Listener, string) {
 }
 
 // ContextOpt returns a new context instance with the new additions to it.
-type ContextOpt func(context.Context) (context.Context, func())
+type ContextOpt func(context.Context) context.Context
 
 // ContextWithLogger allows to inject provided logger into the context.
 func ContextWithLogger(logger *log.Entry) ContextOpt {
-	return func(ctx context.Context) (context.Context, func()) {
-		return ctxlogrus.ToContext(ctx, logger), func() {}
+	return func(ctx context.Context) context.Context {
+		return ctxlogrus.ToContext(ctx, logger)
 	}
 }
 
@@ -180,18 +180,11 @@ func Context(opts ...ContextOpt) (context.Context, func()) {
 	// context.
 	ctx = featureflag.ContextWithFeatureFlags(ctx, featureflag.RunCommandsInCGroup)
 
-	cancels := make([]func(), len(opts)+1)
-	cancels[0] = cancel
-	for i, opt := range opts {
-		ctx, cancel = opt(ctx)
-		cancels[i+1] = cancel
+	for _, opt := range opts {
+		ctx = opt(ctx)
 	}
 
-	return ctx, func() {
-		for i := len(cancels) - 1; i >= 0; i-- {
-			cancels[i]()
-		}
-	}
+	return ctx, cancel
 }
 
 // CreateGlobalDirectory creates a directory in the test directory that is shared across all