diff --git a/etcdserver/etcdhttp/client.go b/etcdserver/etcdhttp/client.go index f35e5fdd5..5a4bf93f8 100644 --- a/etcdserver/etcdhttp/client.go +++ b/etcdserver/etcdhttp/client.go @@ -527,14 +527,14 @@ func trimPrefix(p, prefix string) (s string) { return } -func newMemberCollection(ms []*etcdserver.Member) httptypes.MemberCollection { +func newMemberCollection(ms []*etcdserver.Member) *httptypes.MemberCollection { c := httptypes.MemberCollection(make([]httptypes.Member, len(ms))) for i, m := range ms { c[i] = newMember(m) } - return c + return &c } func newMember(m *etcdserver.Member) httptypes.Member { diff --git a/etcdserver/etcdhttp/client_test.go b/etcdserver/etcdhttp/client_test.go index 1abcbe7da..1f4e780a5 100644 --- a/etcdserver/etcdhttp/client_test.go +++ b/etcdserver/etcdhttp/client_test.go @@ -562,7 +562,7 @@ func TestServeAdminMembers(t *testing.T) { 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 { path string @@ -1591,8 +1591,8 @@ func TestNewMemberCollection(t *testing.T) { }, }) - if !reflect.DeepEqual(want, got) { - t.Fatalf("newMemberCollection failure: want=%#v, got=%#v", want, got) + if !reflect.DeepEqual(&want, got) { + t.Fatalf("newMemberCollection failure: want=%#v, got=%#v", &want, got) } }