github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

fix(compose): fix a data race in a test BE-12231 (#1148)

pull/12845/head
andres-portainer 2025-09-04 17:31:57 -03:00 committed by GitHub
parent f8ae5368bf
commit 54f6add45d
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/libstack/compose/composeplugin_test.go
View File

@ -9,6 +9,7 @@ import (
"path/filepath" "path/filepath"
"strconv" "strconv"
"strings" "strings"
"sync"
"testing" "testing"
"github.com/compose-spec/compose-go/v2/consts" "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) { func Test_DeployWithIgnoreOrphans(t *testing.T) {
var logOutput strings.Builder var logOutput logger
oldLogger := zerolog.Logger oldLogger := zerolog.Logger
zerolog.Logger = zerolog.Output(&logOutput) zerolog.Logger = zerolog.Output(&logOutput)
defer func() { defer func() {