diff --git a/server/v2/tests/delete_handler_test.go b/server/v2/tests/delete_handler_test.go index 82d59321a..04d557f42 100644 --- a/server/v2/tests/delete_handler_test.go +++ b/server/v2/tests/delete_handler_test.go @@ -24,6 +24,6 @@ func TestV2DeleteKey(t *testing.T) { resp, err = tests.DeleteForm(fmt.Sprintf("%s%s", s.URL(), "/v2/keys/foo/bar"), url.Values{}) body := tests.ReadBody(resp) assert.Nil(t, err, "") - assert.Equal(t, string(body), `{"action":"delete","node":{"key":"/foo/bar","prevValue":"XXX","modifiedIndex":3,"createdIndex":2}}`, "") + assert.Equal(t, string(body), `{"action":"delete","node":{"key":"/foo/bar","modifiedIndex":3,"createdIndex":2}}`, "") }) } diff --git a/server/v2/tests/put_handler_test.go b/server/v2/tests/put_handler_test.go index 2507f05ad..94082f4cd 100644 --- a/server/v2/tests/put_handler_test.go +++ b/server/v2/tests/put_handler_test.go @@ -118,9 +118,6 @@ func TestV2UpdateKeySuccess(t *testing.T) { resp, _ = tests.PutForm(fmt.Sprintf("%s%s", s.URL(), "/v2/keys/foo/bar"), v) body := tests.ReadBodyJSON(resp) assert.Equal(t, body["action"], "update", "") - - node := body["node"].(map[string]interface{}) - assert.Equal(t, node["prevValue"], "XXX", "") }) } @@ -178,7 +175,6 @@ func TestV2SetKeyCASOnIndexSuccess(t *testing.T) { body := tests.ReadBodyJSON(resp) assert.Equal(t, body["action"], "compareAndSwap", "") node := body["node"].(map[string]interface{}) - assert.Equal(t, node["prevValue"], "XXX", "") assert.Equal(t, node["value"], "YYY", "") assert.Equal(t, node["modifiedIndex"], 3, "") }) @@ -240,7 +236,6 @@ func TestV2SetKeyCASOnValueSuccess(t *testing.T) { body := tests.ReadBodyJSON(resp) assert.Equal(t, body["action"], "compareAndSwap", "") node := body["node"].(map[string]interface{}) - assert.Equal(t, node["prevValue"], "XXX", "") assert.Equal(t, node["value"], "YYY", "") assert.Equal(t, node["modifiedIndex"], 3, "") }) diff --git a/store/node_extern.go b/store/node_extern.go index 319378f74..514d5c8cf 100644 --- a/store/node_extern.go +++ b/store/node_extern.go @@ -10,7 +10,7 @@ import ( // TTL is time to live in second type NodeExtern struct { Key string `json:"key, omitempty"` - PrevValue string `json:"prevValue,omitempty"` + PrevValue string `json:"-"` Value string `json:"value,omitempty"` Dir bool `json:"dir,omitempty"` Expiration *time.Time `json:"expiration,omitempty"` diff --git a/tests/functional/simple_multi_node_test.go b/tests/functional/simple_multi_node_test.go index 0506b95aa..dc8ed3389 100644 --- a/tests/functional/simple_multi_node_test.go +++ b/tests/functional/simple_multi_node_test.go @@ -54,7 +54,7 @@ func templateTestSimpleMultiNode(t *testing.T, tls bool) { result, err = c.Set("foo", "bar", 100) node = result.Node - if err != nil || node.Key != "/foo" || node.Value != "bar" || node.PrevValue != "bar" || node.TTL < 95 { + if err != nil || node.Key != "/foo" || node.Value != "bar" || node.TTL < 95 { if err != nil { t.Fatal(err) } diff --git a/tests/functional/single_node_test.go b/tests/functional/single_node_test.go index 9294e2f96..95f06c439 100644 --- a/tests/functional/single_node_test.go +++ b/tests/functional/single_node_test.go @@ -43,7 +43,7 @@ func TestSingleNode(t *testing.T) { result, err = c.Set("foo", "bar", 100) node = result.Node - if err != nil || node.Key != "/foo" || node.Value != "bar" || node.PrevValue != "bar" || node.TTL != 100 { + if err != nil || node.Key != "/foo" || node.Value != "bar" || node.TTL != 100 { if err != nil { t.Fatal("Set 2: ", err) } @@ -56,7 +56,7 @@ func TestSingleNode(t *testing.T) { result, err = c.CompareAndSwap("foo", "foobar", 100, "bar", 0) node = result.Node - if err != nil || node.Key != "/foo" || node.Value != "foobar" || node.PrevValue != "bar" || node.TTL != 100 { + if err != nil || node.Key != "/foo" || node.Value != "foobar" || node.TTL != 100 { if err != nil { t.Fatal(err) }