github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-20 09:33:52 +00:00
Code Issues Projects Releases Wiki Activity

gofmt -r "WaitToWatch->WaitForWatchCompletion"

Browse Source
This commit is contained in:
Nan Deng
2014-06-30 16:09:15 -07:00
parent f13f1a5da6
commit 905c6dcb10
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/controller/replication_controller_test.go
View File

@@ -446,7 +446,7 @@ func TestWatchControllers(t *testing.T) {
go manager.watchControllers() go manager.watchControllers()
fakeEtcd.WaitToWatch() fakeEtcd.WaitForWatchCompletion()
// Test normal case // Test normal case
testControllerSpec.ID = "foo" testControllerSpec.ID = "foo"
@@ -473,7 +473,7 @@ func TestWatchControllers(t *testing.T) {
// Test purposeful shutdown // Test purposeful shutdown
go manager.watchControllers() go manager.watchControllers()
fakeEtcd.WaitToWatch() fakeEtcd.WaitForWatchCompletion()
fakeEtcd.WatchStop <- true fakeEtcd.WatchStop <- true
// Did everything shut down? // Did everything shut down?

2
pkg/util/fake_etcd_client.go
View File

@@ -105,7 +105,7 @@ func (f *FakeEtcdClient) Delete(key string, recursive bool) (*etcd.Response, err
return &etcd.Response{}, f.Err return &etcd.Response{}, f.Err
} }
func (f *FakeEtcdClient) WaitToWatch() { func (f *FakeEtcdClient) WaitForWatchCompletion() {
f.condLock.Lock() f.condLock.Lock()
defer f.condLock.Unlock() defer f.condLock.Unlock()
f.condChannelsReady.Wait() f.condChannelsReady.Wait()