From 7b432eac5c6530c60c0cca3fc74698af44e3c87e Mon Sep 17 00:00:00 2001 From: Nan Deng Date: Mon, 30 Jun 2014 18:05:01 -0700 Subject: [PATCH] gofmt -r "condChannelsReady->condWatchCompleted" --- pkg/util/fake_etcd_client.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkg/util/fake_etcd_client.go b/pkg/util/fake_etcd_client.go index 653a919e46d..68eb2c09d59 100644 --- a/pkg/util/fake_etcd_client.go +++ b/pkg/util/fake_etcd_client.go @@ -30,8 +30,8 @@ type EtcdResponseWithError struct { } type FakeEtcdClient struct { - condChannelsReady *sync.Cond - condLock sync.Mutex + condWatchCompleted *sync.Cond + condLock sync.Mutex Data map[string]EtcdResponseWithError DeletedKeys []string @@ -54,7 +54,7 @@ func MakeFakeEtcdClient(t *testing.T) *FakeEtcdClient { // watchChanReady: make(chan bool), } // The channels are not ready yet - ret.condChannelsReady = sync.NewCond(&ret.condLock) + ret.condWatchCompleted = sync.NewCond(&ret.condLock) return ret } @@ -108,7 +108,7 @@ func (f *FakeEtcdClient) Delete(key string, recursive bool) (*etcd.Response, err func (f *FakeEtcdClient) WaitForWatchCompletion() { f.condLock.Lock() defer f.condLock.Unlock() - f.condChannelsReady.Wait() + f.condWatchCompleted.Wait() } func (f *FakeEtcdClient) Watch(prefix string, waitIndex uint64, recursive bool, receiver chan *etcd.Response, stop chan bool) (*etcd.Response, error) { @@ -120,13 +120,13 @@ func (f *FakeEtcdClient) Watch(prefix string, waitIndex uint64, recursive bool, f.WatchInjectError = injectedError f.condLock.Lock() - f.condChannelsReady.Broadcast() + f.condWatchCompleted.Broadcast() f.condLock.Unlock() // After calling this function, the WatchStop channel will not be ready defer func() { f.condLock.Lock() - f.condChannelsReady = sync.NewCond(&f.condLock) + f.condWatchCompleted = sync.NewCond(&f.condLock) f.condLock.Unlock() }()