github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fail immediately if f.Err is set

Browse Source
This commit is contained in:
Kouhei Ueno 2014-07-31 16:15:03 +09:00
parent e40cdd50ed
commit d46bfcb132
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/tools/fake_etcd_client.go
View File

@ -97,6 +97,10 @@ func (f *FakeEtcdClient) Get(key string, sort, recursive bool) (*etcd.Response,
} }
func (f *FakeEtcdClient) Set(key, value string, ttl uint64) (*etcd.Response, error) { func (f *FakeEtcdClient) Set(key, value string, ttl uint64) (*etcd.Response, error) {
if f.Err != nil {
return nil, f.Err
}
i := f.generateIndex() i := f.generateIndex()
if prevResult, ok := f.Data[key]; ok && prevResult.R != nil && prevResult.R.Node != nil { if prevResult, ok := f.Data[key]; ok && prevResult.R != nil && prevResult.R.Node != nil {
@ -111,7 +115,7 @@ func (f *FakeEtcdClient) Set(key, value string, ttl uint64) (*etcd.Response, err
}, },
} }
f.Data[key] = result f.Data[key] = result
return result.R, f.Err return result.R, nil
} }
result := EtcdResponseWithError{ result := EtcdResponseWithError{
@ -124,7 +128,7 @@ func (f *FakeEtcdClient) Set(key, value string, ttl uint64) (*etcd.Response, err
}, },
} }
f.Data[key] = result f.Data[key] = result
return result.R, f.Err return result.R, nil
} }
func (f *FakeEtcdClient) CompareAndSwap(key, value string, ttl uint64, prevValue string, prevIndex uint64) (*etcd.Response, error) { func (f *FakeEtcdClient) CompareAndSwap(key, value string, ttl uint64, prevValue string, prevIndex uint64) (*etcd.Response, error) {
@ -136,6 +140,10 @@ func (f *FakeEtcdClient) Create(key, value string, ttl uint64) (*etcd.Response,
return f.Set(key, value, ttl) return f.Set(key, value, ttl)
} }
func (f *FakeEtcdClient) Delete(key string, recursive bool) (*etcd.Response, error) { func (f *FakeEtcdClient) Delete(key string, recursive bool) (*etcd.Response, error) {
if f.Err != nil {
return f.Err
}
f.Data[key] = EtcdResponseWithError{ f.Data[key] = EtcdResponseWithError{
R: &etcd.Response{ R: &etcd.Response{
Node: nil, Node: nil,
@ -144,7 +152,7 @@ func (f *FakeEtcdClient) Delete(key string, recursive bool) (*etcd.Response, err
} }
f.DeletedKeys = append(f.DeletedKeys, key) f.DeletedKeys = append(f.DeletedKeys, key)
return &etcd.Response{}, f.Err return &etcd.Response{}, nil
} }
func (f *FakeEtcdClient) WaitForWatchCompletion() { func (f *FakeEtcdClient) WaitForWatchCompletion() {