From 54f6add45db44a1216b656f2423afd54b8bf728f Mon Sep 17 00:00:00 2001 From: andres-portainer <91705312+andres-portainer@users.noreply.github.com> Date: Thu, 4 Sep 2025 17:31:57 -0300 Subject: [PATCH] fix(compose): fix a data race in a test BE-12231 (#1148) --- pkg/libstack/compose/composeplugin_test.go | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/pkg/libstack/compose/composeplugin_test.go b/pkg/libstack/compose/composeplugin_test.go index 6668ec1e6..00dd20bfa 100644 --- a/pkg/libstack/compose/composeplugin_test.go +++ b/pkg/libstack/compose/composeplugin_test.go @@ -9,6 +9,7 @@ import ( "path/filepath" "strconv" "strings" + "sync" "testing" "github.com/compose-spec/compose-go/v2/consts" @@ -476,8 +477,20 @@ func Test_DeployWithRemoveOrphans(t *testing.T) { } } +type logger struct { + sync.Mutex + strings.Builder +} + +func (l *logger) Write(p []byte) (n int, err error) { + l.Lock() + defer l.Unlock() + + return l.Builder.Write(p) +} + func Test_DeployWithIgnoreOrphans(t *testing.T) { - var logOutput strings.Builder + var logOutput logger oldLogger := zerolog.Logger zerolog.Logger = zerolog.Output(&logOutput) defer func() {