From e0815be27d1ae0490ddb101722fc6798e42ce097 Mon Sep 17 00:00:00 2001 From: David Zhao Date: Mon, 8 Jun 2026 08:27:15 -0700 Subject: [PATCH] chore: improve docker test shutdown reliability (#4576) --- pkg/service/docker_test.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkg/service/docker_test.go b/pkg/service/docker_test.go index 1168d5982..9fc5b90bb 100644 --- a/pkg/service/docker_test.go +++ b/pkg/service/docker_test.go @@ -75,7 +75,9 @@ func runRedis(t testing.TB) string { t.Fatal(err) } t.Cleanup(func() { - _ = c.Close(t.Context()) + // t.Context() is canceled before cleanup funcs run, so use a + // non-canceled context to let the container stop/remove complete. + _ = c.Close(context.Background()) }) addr := c.GetHostPort("6379/tcp") waitTCPPort(t, addr)