Merge pull request moby#4921 from tonistiigi/test-sandbox-cancel

testutil: make sure context is canceled after test end
profnandaa · May 13, 2024 · 4bdc49b · 4bdc49b
2 parents 9541488 + 89b6379
commit 4bdc49b
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/util/testutil/integration/run.go b/util/testutil/integration/run.go
@@ -21,6 +21,7 @@ import (
 	"github.com/moby/buildkit/util/appcontext"
 	"github.com/moby/buildkit/util/contentutil"
 	ocispecs "github.com/opencontainers/image-spec/specs-go/v1"
+	"github.com/pkg/errors"
 	"github.com/stretchr/testify/require"
 	"golang.org/x/sync/semaphore"
 )
@@ -197,6 +198,9 @@ func Run(t *testing.T, testCases []Test, opt ...TestOpt) {
 						require.NoError(t, sandboxLimiter.Acquire(context.TODO(), 1))
 						defer sandboxLimiter.Release(1)
 
+						ctx, cancel := context.WithCancelCause(ctx)
+						defer cancel(errors.WithStack(context.Canceled))
+
 						sb, closer, err := newSandbox(ctx, br, mirror, mv)
 						require.NoError(t, err)
 						t.Cleanup(func() { _ = closer() })