Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

etcdhttp: encode MembersCollection properly

Browse Source
This commit is contained in:
Brian Waldon 2014-10-28 09:16:45 -07:00
parent 35bba87d2a
commit d3bafd6aa4
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
etcdserver/etcdhttp/client.go
View File

@ -527,14 +527,14 @@ func trimPrefix(p, prefix string) (s string) {
return return
} }
func newMemberCollection(ms []*etcdserver.Member) httptypes.MemberCollection { func newMemberCollection(ms []*etcdserver.Member) *httptypes.MemberCollection {
c := httptypes.MemberCollection(make([]httptypes.Member, len(ms))) c := httptypes.MemberCollection(make([]httptypes.Member, len(ms)))
for i, m := range ms { for i, m := range ms {
c[i] = newMember(m) c[i] = newMember(m)
} }
return c return &c
} }
func newMember(m *etcdserver.Member) httptypes.Member { func newMember(m *etcdserver.Member) httptypes.Member {

6
etcdserver/etcdhttp/client_test.go
View File

@ -562,7 +562,7 @@ func TestServeAdminMembers(t *testing.T) {
clusterInfo: cluster, clusterInfo: cluster,
} }
wmc := string(`[{"id":"c","name":"","peerURLs":[],"clientURLs":["http://localhost:8080"]},{"id":"d","name":"","peerURLs":[],"clientURLs":["http://localhost:8081"]}]`) wmc := string(`{"members":[{"id":"c","name":"","peerURLs":[],"clientURLs":["http://localhost:8080"]},{"id":"d","name":"","peerURLs":[],"clientURLs":["http://localhost:8081"]}]}`)
tests := []struct { tests := []struct {
path string path string
@ -1591,8 +1591,8 @@ func TestNewMemberCollection(t *testing.T) {
}, },
}) })
if !reflect.DeepEqual(want, got) { if !reflect.DeepEqual(&want, got) {
t.Fatalf("newMemberCollection failure: want=%#v, got=%#v", want, got) t.Fatalf("newMemberCollection failure: want=%#v, got=%#v", &want, got)
} }
} }