From 4f6e09d8544f84b07cfe8ea0e274b81cdac4136e Mon Sep 17 00:00:00 2001
From: Mike Danese <mikedanese@gmail.com>
Date: Mon, 2 Mar 2015 14:28:21 -0800
Subject: [PATCH] add tests to pkg/tools/etcd_tools_test.go

---
 pkg/tools/etcd_tools_test.go | 45 ++++++++++++++++++++++++++++++++----
 1 file changed, 40 insertions(+), 5 deletions(-)

diff --git a/pkg/tools/etcd_tools_test.go b/pkg/tools/etcd_tools_test.go
index 472b30b9033..9f582c8bfe8 100644
--- a/pkg/tools/etcd_tools_test.go
+++ b/pkg/tools/etcd_tools_test.go
@@ -354,7 +354,8 @@ func TestCreateObj(t *testing.T) {
 	obj := &api.Pod{ObjectMeta: api.ObjectMeta{Name: "foo"}}
 	fakeClient := NewFakeEtcdClient(t)
 	helper := EtcdHelper{fakeClient, testapi.Codec(), versioner}
-	err := helper.CreateObj("/some/key", obj, nil, 5)
+	returnedObj := &api.Pod{}
+	err := helper.CreateObj("/some/key", obj, returnedObj, 5)
 	if err != nil {
 		t.Errorf("Unexpected error %#v", err)
 	}
@@ -369,13 +370,27 @@ func TestCreateObj(t *testing.T) {
 	if e, a := uint64(5), fakeClient.LastSetTTL; e != a {
 		t.Errorf("Wanted %v, got %v", e, a)
 	}
+	if obj.ResourceVersion != returnedObj.ResourceVersion || obj.Name != returnedObj.Name {
+		t.Errorf("If set was successful but returned object did not have correct resource version")
+	}
+}
+
+func TestCreateObjNilOutParam(t *testing.T) {
+	obj := &api.Pod{ObjectMeta: api.ObjectMeta{Name: "foo"}}
+	fakeClient := NewFakeEtcdClient(t)
+	helper := EtcdHelper{fakeClient, testapi.Codec(), versioner}
+	err := helper.CreateObj("/some/key", obj, nil, 5)
+	if err != nil {
+		t.Errorf("Unexpected error %#v", err)
+	}
 }
 
 func TestSetObj(t *testing.T) {
 	obj := &api.Pod{ObjectMeta: api.ObjectMeta{Name: "foo"}}
 	fakeClient := NewFakeEtcdClient(t)
 	helper := EtcdHelper{fakeClient, testapi.Codec(), versioner}
-	err := helper.SetObj("/some/key", obj, nil, 5)
+	returnedObj := &api.Pod{}
+	err := helper.SetObj("/some/key", obj, returnedObj, 5)
 	if err != nil {
 		t.Errorf("Unexpected error %#v", err)
 	}
@@ -391,7 +406,9 @@ func TestSetObj(t *testing.T) {
 	if e, a := uint64(5), fakeClient.LastSetTTL; e != a {
 		t.Errorf("Wanted %v, got %v", e, a)
 	}
-
+	if obj.ResourceVersion != returnedObj.ResourceVersion || obj.Name != returnedObj.Name {
+		t.Errorf("If set was successful but returned object did not have correct resource version")
+	}
 }
 
 func TestSetObjWithVersion(t *testing.T) {
@@ -408,7 +425,8 @@ func TestSetObjWithVersion(t *testing.T) {
 	}
 
 	helper := EtcdHelper{fakeClient, testapi.Codec(), versioner}
-	err := helper.SetObj("/some/key", obj, nil, 7)
+	returnedObj := &api.Pod{}
+	err := helper.SetObj("/some/key", obj, returnedObj, 7)
 	if err != nil {
 		t.Fatalf("Unexpected error %#v", err)
 	}
@@ -424,13 +442,17 @@ func TestSetObjWithVersion(t *testing.T) {
 	if e, a := uint64(7), fakeClient.LastSetTTL; e != a {
 		t.Errorf("Wanted %v, got %v", e, a)
 	}
+	if obj.ResourceVersion != returnedObj.ResourceVersion || obj.Name != returnedObj.Name {
+		t.Errorf("If set was successful but returned object did not have correct resource version")
+	}
 }
 
 func TestSetObjWithoutResourceVersioner(t *testing.T) {
 	obj := &api.Pod{ObjectMeta: api.ObjectMeta{Name: "foo"}}
 	fakeClient := NewFakeEtcdClient(t)
 	helper := EtcdHelper{fakeClient, testapi.Codec(), nil}
-	err := helper.SetObj("/some/key", obj, nil, 3)
+	returnedObj := &api.Pod{}
+	err := helper.SetObj("/some/key", obj, returnedObj, 3)
 	if err != nil {
 		t.Errorf("Unexpected error %#v", err)
 	}
@@ -446,6 +468,19 @@ func TestSetObjWithoutResourceVersioner(t *testing.T) {
 	if e, a := uint64(3), fakeClient.LastSetTTL; e != a {
 		t.Errorf("Wanted %v, got %v", e, a)
 	}
+	if obj.ResourceVersion != returnedObj.ResourceVersion || obj.Name != returnedObj.Name {
+		t.Errorf("If set was successful but returned object did not have correct resource version")
+	}
+}
+
+func TestSetObjNilOutParam(t *testing.T) {
+	obj := &api.Pod{ObjectMeta: api.ObjectMeta{Name: "foo"}}
+	fakeClient := NewFakeEtcdClient(t)
+	helper := EtcdHelper{fakeClient, testapi.Codec(), nil}
+	err := helper.SetObj("/some/key", obj, nil, 3)
+	if err != nil {
+		t.Errorf("Unexpected error %#v", err)
+	}
 }
 
 func TestAtomicUpdate(t *testing.T) {