From 17bad028cee8d57c93768959f1ee4231e6e7a19c Mon Sep 17 00:00:00 2001 From: Dawn Chen Date: Tue, 1 Jul 2014 15:15:40 -0700 Subject: [PATCH] Fixed the data race found in kubelet_test.go --- pkg/kubelet/kubelet_test.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkg/kubelet/kubelet_test.go b/pkg/kubelet/kubelet_test.go index 517129b7c38..a9185fb80eb 100644 --- a/pkg/kubelet/kubelet_test.go +++ b/pkg/kubelet/kubelet_test.go @@ -887,7 +887,12 @@ func TestWatchEtcd(t *testing.T) { data, err := json.Marshal(manifest) expectNoError(t, err) - go kubelet.WatchEtcd(watchChannel, updateChannel) + var wg sync.WaitGroup + wg.Add(1) + go func() { + kubelet.WatchEtcd(watchChannel, updateChannel) + wg.Done() + }() watchChannel <- &etcd.Response{ Node: &etcd.Node{ @@ -895,6 +900,7 @@ func TestWatchEtcd(t *testing.T) { }, } close(watchChannel) + wg.Wait() close(updateChannel) read := reader.GetList()