Merge pull request #331 from dchen1107/cleanup

Fixed the data race found in kubelet_test.go
This commit is contained in:
brendandburns 2014-07-01 15:30:36 -07:00
commit 67eae1f645

View File

@ -834,7 +834,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{
@ -842,6 +847,7 @@ func TestWatchEtcd(t *testing.T) {
},
}
close(watchChannel)
wg.Wait()
close(updateChannel)
read := reader.GetList()