fix: bound container cleanup termination with 30s timeout

github-actions[bot] · gaarutyunov · github-actions[bot] · commit ec99b32f7af0 · 2026-03-31T11:30:26.000Z
CodeRabbit nitpick: c.Terminate(context.Background()) could block indefinitely;
use a timeout-bound context instead.

Co-authored-by: German Arutyunov &lt;gaarutyunov@users.noreply.github.com&gt;
diff --git a/internal/testutil/containers.go b/internal/testutil/containers.go
@@ -5,6 +5,7 @@ package testutil
 import (
 	"context"
 	"testing"
+	"time"
 
 	"github.com/testcontainers/testcontainers-go"
 )
@@ -21,7 +22,9 @@ func MustStartContainer(ctx context.Context, t *testing.T, req testcontainers.Co
 		t.Fatalf("start container %q: %v", req.Image, err)
 	}
 	t.Cleanup(func() {
-		if err := c.Terminate(context.Background()); err != nil {
+		termCtx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
+		defer cancel()
+		if err := c.Terminate(termCtx); err != nil {
 			t.Logf("terminate container %q: %v", req.Image, err)
 		}
 	})

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@ package testutil`
`5`	`5`	`import (`
`6`	`6`	`"context"`
`7`	`7`	`"testing"`
	`8`	`+ "time"`
`8`	`9`
`9`	`10`	`"github.com/testcontainers/testcontainers-go"`
`10`	`11`	`)`
`@@ -21,7 +22,9 @@ func MustStartContainer(ctx context.Context, t *testing.T, req testcontainers.Co`
`21`	`22`	`t.Fatalf("start container %q: %v", req.Image, err)`
`22`	`23`	`}`
`23`	`24`	`t.Cleanup(func() {`
`24`		`- if err := c.Terminate(context.Background()); err != nil {`
	`25`	`+ termCtx, cancel := context.WithTimeout(context.Background(), 30*time.Second)`
	`26`	`+ defer cancel()`
	`27`	`+ if err := c.Terminate(termCtx); err != nil {`
`25`	`28`	`t.Logf("terminate container %q: %v", req.Image, err)`
`26`	`29`	`}`
`27`	`30`	`})`