From 905c6dcb1053bef3a29cf6bd9c94e825cbd68e35 Mon Sep 17 00:00:00 2001 From: Nan Deng Date: Mon, 30 Jun 2014 16:09:15 -0700 Subject: [PATCH] gofmt -r "WaitToWatch->WaitForWatchCompletion" --- pkg/controller/replication_controller_test.go | 4 ++-- pkg/util/fake_etcd_client.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/controller/replication_controller_test.go b/pkg/controller/replication_controller_test.go index dd6a5be6fac..e83cf695eea 100644 --- a/pkg/controller/replication_controller_test.go +++ b/pkg/controller/replication_controller_test.go @@ -446,7 +446,7 @@ func TestWatchControllers(t *testing.T) { go manager.watchControllers() - fakeEtcd.WaitToWatch() + fakeEtcd.WaitForWatchCompletion() // Test normal case testControllerSpec.ID = "foo" @@ -473,7 +473,7 @@ func TestWatchControllers(t *testing.T) { // Test purposeful shutdown go manager.watchControllers() - fakeEtcd.WaitToWatch() + fakeEtcd.WaitForWatchCompletion() fakeEtcd.WatchStop <- true // Did everything shut down? diff --git a/pkg/util/fake_etcd_client.go b/pkg/util/fake_etcd_client.go index a0435a8a2ba..653a919e46d 100644 --- a/pkg/util/fake_etcd_client.go +++ b/pkg/util/fake_etcd_client.go @@ -105,7 +105,7 @@ func (f *FakeEtcdClient) Delete(key string, recursive bool) (*etcd.Response, err return &etcd.Response{}, f.Err } -func (f *FakeEtcdClient) WaitToWatch() { +func (f *FakeEtcdClient) WaitForWatchCompletion() { f.condLock.Lock() defer f.condLock.Unlock() f.condChannelsReady.Wait()