Generic atomic update code

This commit is contained in:
Daniel Smith
2014-06-27 10:55:05 -07:00
parent 4102abe11c
commit 529870d121
3 changed files with 81 additions and 25 deletions

View File

@@ -86,7 +86,7 @@ func TestExtractObj(t *testing.T) {
fakeClient.Set("/some/key", MakeJSONString(expect), 0)
helper := EtcdHelper{fakeClient}
var got testMarshalType
err, _ := helper.ExtractObj("/some/key", &got, false)
_, err := helper.ExtractObj("/some/key", &got, false)
if err != nil {
t.Errorf("Unexpected error %#v", err)
}
@@ -120,11 +120,11 @@ func TestExtractObjNotFoundErr(t *testing.T) {
helper := EtcdHelper{fakeClient}
try := func(key string) {
var got testMarshalType
err, _ := helper.ExtractObj(key, &got, false)
_, err := helper.ExtractObj(key, &got, false)
if err == nil {
t.Errorf("%s: wanted error but didn't get one", key)
}
err, _ = helper.ExtractObj(key, &got, true)
_, err = helper.ExtractObj(key, &got, true)
if err != nil {
t.Errorf("%s: didn't want error but got %#v", key, err)
}