From 1c46623429d64fe562dfffadcc3edcc9d35bd88b Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Wed, 25 May 2016 04:19:01 +0000 Subject: [PATCH] Fix a race in daemon/logger.TestCopier Update #22963 Signed-off-by: Akihiro Suda Upstream-commit: ab533f06510a14a023c056604f9520741073acd3 Component: engine --- components/engine/daemon/logger/copier_test.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/components/engine/daemon/logger/copier_test.go b/components/engine/daemon/logger/copier_test.go index 30239f06bc..3b1ffe910c 100644 --- a/components/engine/daemon/logger/copier_test.go +++ b/components/engine/daemon/logger/copier_test.go @@ -4,12 +4,14 @@ import ( "bytes" "encoding/json" "io" + "sync" "testing" "time" ) type TestLoggerJSON struct { *json.Encoder + mu sync.Mutex delay time.Duration } @@ -17,6 +19,8 @@ func (l *TestLoggerJSON) Log(m *Message) error { if l.delay > 0 { time.Sleep(l.delay) } + l.mu.Lock() + defer l.mu.Unlock() return l.Encode(m) }