mirrors/etcd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

etcdserver: use member pointer for all tests

Browse Source
This commit is contained in:
Xiang Li
2014-11-11 11:19:34 -08:00
parent e4931e0c47
commit 67a0de4bbc
3 changed files with 75 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

136
etcdserver/cluster_test.go
View File

@ -31,14 +31,14 @@ import (
func TestClusterFromString(t *testing.T) { func TestClusterFromString(t *testing.T) {
tests := []struct { tests := []struct {
f string f string
mems []Member mems []*Member
}{ }{
{ {
"mem1=http://10.0.0.1:2379,mem1=http://128.193.4.20:2379,mem2=http://10.0.0.2:2379,default=http://127.0.0.1:2379", "mem1=http://10.0.0.1:2379,mem1=http://128.193.4.20:2379,mem2=http://10.0.0.2:2379,default=http://127.0.0.1:2379",
[]Member{ []*Member{
*newTestMember(4322322643958477905, []string{"http://10.0.0.1:2379", "http://128.193.4.20:2379"}, "mem1", nil), newTestMember(3141198903430435750, []string{"http://10.0.0.2:2379"}, "mem2", nil),
*newTestMember(3141198903430435750, []string{"http://10.0.0.2:2379"}, "mem2", nil), newTestMember(4322322643958477905, []string{"http://10.0.0.1:2379", "http://128.193.4.20:2379"}, "mem1", nil),
*newTestMember(12762790032478827328, []string{"http://127.0.0.1:2379"}, "default", nil), newTestMember(12762790032478827328, []string{"http://127.0.0.1:2379"}, "default", nil),
}, },
}, },
} }
@ -50,9 +50,8 @@ func TestClusterFromString(t *testing.T) {
if c.token != "abc" { if c.token != "abc" {
t.Errorf("#%d: token = %v, want abc", i, c.token) t.Errorf("#%d: token = %v, want abc", i, c.token)
} }
wc := newTestCluster(tt.mems) if !reflect.DeepEqual(c.Members(), tt.mems) {
if !reflect.DeepEqual(c.members, wc.members) { t.Errorf("#%d: members = %+v, want %+v", i, c.Members(), tt.mems)
t.Errorf("#%d: members = %+v, want %+v", i, c.members, wc.members)
} }
} }
} }
@ -80,41 +79,40 @@ func TestClusterFromStringBad(t *testing.T) {
func TestClusterFromStore(t *testing.T) { func TestClusterFromStore(t *testing.T) {
tests := []struct { tests := []struct {
mems []Member mems []*Member
}{ }{
{ {
[]Member{*newTestMember(1, nil, "node1", nil)}, []*Member{newTestMember(1, nil, "node1", nil)},
}, },
{ {
[]Member{}, nil,
}, },
{ {
[]Member{ []*Member{
*newTestMember(1, nil, "node1", nil), newTestMember(1, nil, "node1", nil),
*newTestMember(2, nil, "node2", nil), newTestMember(2, nil, "node2", nil),
}, },
}, },
} }
for i, tt := range tests { for i, tt := range tests {
hc := newTestCluster(nil) hc := newTestCluster(nil)
for _, m := range tt.mems { for _, m := range tt.mems {
hc.AddMember(&m) hc.AddMember(m)
} }
c := NewClusterFromStore("abc", hc.store) c := NewClusterFromStore("abc", hc.store)
if c.token != "abc" { if c.token != "abc" {
t.Errorf("#%d: token = %v, want %v", i, c.token, "abc") t.Errorf("#%d: token = %v, want %v", i, c.token, "abc")
} }
wc := newTestCluster(tt.mems) if !reflect.DeepEqual(c.Members(), tt.mems) {
if !reflect.DeepEqual(c.members, wc.members) { t.Errorf("#%d: members = %v, want %v", i, c.Members(), tt.mems)
t.Errorf("#%d: members = %v, want %v", i, c.members, wc.members)
} }
} }
} }
func TestClusterMember(t *testing.T) { func TestClusterMember(t *testing.T) {
membs := []Member{ membs := []*Member{
*newTestMember(1, nil, "node1", nil), newTestMember(1, nil, "node1", nil),
*newTestMember(2, nil, "node2", nil), newTestMember(2, nil, "node2", nil),
} }
tests := []struct { tests := []struct {
id types.ID id types.ID
@ -137,9 +135,9 @@ func TestClusterMember(t *testing.T) {
} }
func TestClusterMemberByName(t *testing.T) { func TestClusterMemberByName(t *testing.T) {
membs := []Member{ membs := []*Member{
*newTestMember(1, nil, "node1", nil), newTestMember(1, nil, "node1", nil),
*newTestMember(2, nil, "node2", nil), newTestMember(2, nil, "node2", nil),
} }
tests := []struct { tests := []struct {
name string name string
@ -162,10 +160,10 @@ func TestClusterMemberByName(t *testing.T) {
} }
func TestClusterMemberIDs(t *testing.T) { func TestClusterMemberIDs(t *testing.T) {
c := newTestCluster([]Member{ c := newTestCluster([]*Member{
*newTestMember(1, nil, "", nil), newTestMember(1, nil, "", nil),
*newTestMember(4, nil, "", nil), newTestMember(4, nil, "", nil),
*newTestMember(100, nil, "", nil), newTestMember(100, nil, "", nil),
}) })
w := []types.ID{1, 4, 100} w := []types.ID{1, 4, 100}
g := c.MemberIDs() g := c.MemberIDs()
@ -176,45 +174,45 @@ func TestClusterMemberIDs(t *testing.T) {
func TestClusterPeerURLs(t *testing.T) { func TestClusterPeerURLs(t *testing.T) {
tests := []struct { tests := []struct {
mems []Member mems []*Member
wurls []string wurls []string
}{ }{
// single peer with a single address // single peer with a single address
{ {
mems: []Member{ mems: []*Member{
*newTestMember(1, []string{"http://192.0.2.1"}, "", nil), newTestMember(1, []string{"http://192.0.2.1"}, "", nil),
}, },
wurls: []string{"http://192.0.2.1"}, wurls: []string{"http://192.0.2.1"},
}, },
// single peer with a single address with a port // single peer with a single address with a port
{ {
mems: []Member{ mems: []*Member{
*newTestMember(1, []string{"http://192.0.2.1:8001"}, "", nil), newTestMember(1, []string{"http://192.0.2.1:8001"}, "", nil),
}, },
wurls: []string{"http://192.0.2.1:8001"}, wurls: []string{"http://192.0.2.1:8001"},
}, },
// several members explicitly unsorted // several members explicitly unsorted
{ {
mems: []Member{ mems: []*Member{
*newTestMember(2, []string{"http://192.0.2.3", "http://192.0.2.4"}, "", nil), newTestMember(2, []string{"http://192.0.2.3", "http://192.0.2.4"}, "", nil),
*newTestMember(3, []string{"http://192.0.2.5", "http://192.0.2.6"}, "", nil), newTestMember(3, []string{"http://192.0.2.5", "http://192.0.2.6"}, "", nil),
*newTestMember(1, []string{"http://192.0.2.1", "http://192.0.2.2"}, "", nil), newTestMember(1, []string{"http://192.0.2.1", "http://192.0.2.2"}, "", nil),
}, },
wurls: []string{"http://192.0.2.1", "http://192.0.2.2", "http://192.0.2.3", "http://192.0.2.4", "http://192.0.2.5", "http://192.0.2.6"}, wurls: []string{"http://192.0.2.1", "http://192.0.2.2", "http://192.0.2.3", "http://192.0.2.4", "http://192.0.2.5", "http://192.0.2.6"},
}, },
// no members // no members
{ {
mems: []Member{}, mems: []*Member{},
wurls: []string{}, wurls: []string{},
}, },
// peer with no peer urls // peer with no peer urls
{ {
mems: []Member{ mems: []*Member{
*newTestMember(3, []string{}, "", nil), newTestMember(3, []string{}, "", nil),
}, },
wurls: []string{}, wurls: []string{},
}, },
@ -231,45 +229,45 @@ func TestClusterPeerURLs(t *testing.T) {
func TestClusterClientURLs(t *testing.T) { func TestClusterClientURLs(t *testing.T) {
tests := []struct { tests := []struct {
mems []Member mems []*Member
wurls []string wurls []string
}{ }{
// single peer with a single address // single peer with a single address
{ {
mems: []Member{ mems: []*Member{
*newTestMember(1, nil, "", []string{"http://192.0.2.1"}), newTestMember(1, nil, "", []string{"http://192.0.2.1"}),
}, },
wurls: []string{"http://192.0.2.1"}, wurls: []string{"http://192.0.2.1"},
}, },
// single peer with a single address with a port // single peer with a single address with a port
{ {
mems: []Member{ mems: []*Member{
*newTestMember(1, nil, "", []string{"http://192.0.2.1:8001"}), newTestMember(1, nil, "", []string{"http://192.0.2.1:8001"}),
}, },
wurls: []string{"http://192.0.2.1:8001"}, wurls: []string{"http://192.0.2.1:8001"},
}, },
// several members explicitly unsorted // several members explicitly unsorted
{ {
mems: []Member{ mems: []*Member{
*newTestMember(2, nil, "", []string{"http://192.0.2.3", "http://192.0.2.4"}), newTestMember(2, nil, "", []string{"http://192.0.2.3", "http://192.0.2.4"}),
*newTestMember(3, nil, "", []string{"http://192.0.2.5", "http://192.0.2.6"}), newTestMember(3, nil, "", []string{"http://192.0.2.5", "http://192.0.2.6"}),
*newTestMember(1, nil, "", []string{"http://192.0.2.1", "http://192.0.2.2"}), newTestMember(1, nil, "", []string{"http://192.0.2.1", "http://192.0.2.2"}),
}, },
wurls: []string{"http://192.0.2.1", "http://192.0.2.2", "http://192.0.2.3", "http://192.0.2.4", "http://192.0.2.5", "http://192.0.2.6"}, wurls: []string{"http://192.0.2.1", "http://192.0.2.2", "http://192.0.2.3", "http://192.0.2.4", "http://192.0.2.5", "http://192.0.2.6"},
}, },
// no members // no members
{ {
mems: []Member{}, mems: []*Member{},
wurls: []string{}, wurls: []string{},
}, },
// peer with no client urls // peer with no client urls
{ {
mems: []Member{ mems: []*Member{
*newTestMember(3, nil, "", []string{}), newTestMember(3, nil, "", []string{}),
}, },
wurls: []string{}, wurls: []string{},
}, },
@ -286,20 +284,20 @@ func TestClusterClientURLs(t *testing.T) {
func TestClusterValidateAndAssignIDsBad(t *testing.T) { func TestClusterValidateAndAssignIDsBad(t *testing.T) {
tests := []struct { tests := []struct {
clmembs []Member clmembs []*Member
membs []*Member membs []*Member
}{ }{
{ {
// unmatched length // unmatched length
[]Member{ []*Member{
*newTestMember(1, []string{"http://127.0.0.1:2379"}, "", nil), newTestMember(1, []string{"http://127.0.0.1:2379"}, "", nil),
}, },
[]*Member{}, []*Member{},
}, },
{ {
// unmatched peer urls // unmatched peer urls
[]Member{ []*Member{
*newTestMember(1, []string{"http://127.0.0.1:2379"}, "", nil), newTestMember(1, []string{"http://127.0.0.1:2379"}, "", nil),
}, },
[]*Member{ []*Member{
newTestMember(1, []string{"http://127.0.0.1:4001"}, "", nil), newTestMember(1, []string{"http://127.0.0.1:4001"}, "", nil),
@ -307,9 +305,9 @@ func TestClusterValidateAndAssignIDsBad(t *testing.T) {
}, },
{ {
// unmatched peer urls // unmatched peer urls
[]Member{ []*Member{
*newTestMember(1, []string{"http://127.0.0.1:2379"}, "", nil), newTestMember(1, []string{"http://127.0.0.1:2379"}, "", nil),
*newTestMember(2, []string{"http://127.0.0.2:2379"}, "", nil), newTestMember(2, []string{"http://127.0.0.2:2379"}, "", nil),
}, },
[]*Member{ []*Member{
newTestMember(1, []string{"http://127.0.0.1:2379"}, "", nil), newTestMember(1, []string{"http://127.0.0.1:2379"}, "", nil),
@ -327,14 +325,14 @@ func TestClusterValidateAndAssignIDsBad(t *testing.T) {
func TestClusterValidateAndAssignIDs(t *testing.T) { func TestClusterValidateAndAssignIDs(t *testing.T) {
tests := []struct { tests := []struct {
clmembs []Member clmembs []*Member
membs []*Member membs []*Member
wids []types.ID wids []types.ID
}{ }{
{ {
[]Member{ []*Member{
*newTestMember(1, []string{"http://127.0.0.1:2379"}, "", nil), newTestMember(1, []string{"http://127.0.0.1:2379"}, "", nil),
*newTestMember(2, []string{"http://127.0.0.2:2379"}, "", nil), newTestMember(2, []string{"http://127.0.0.2:2379"}, "", nil),
}, },
[]*Member{ []*Member{
newTestMember(3, []string{"http://127.0.0.1:2379"}, "", nil), newTestMember(3, []string{"http://127.0.0.1:2379"}, "", nil),
@ -426,9 +424,9 @@ func TestClusterValidateConfigurationChange(t *testing.T) {
} }
func TestClusterGenID(t *testing.T) { func TestClusterGenID(t *testing.T) {
cs := newTestCluster([]Member{ cs := newTestCluster([]*Member{
*newTestMember(1, nil, "", nil), newTestMember(1, nil, "", nil),
*newTestMember(2, nil, "", nil), newTestMember(2, nil, "", nil),
}) })
cs.genID() cs.genID()
@ -605,11 +603,11 @@ func TestNodeToMember(t *testing.T) {
} }
} }
func newTestCluster(membs []Member) *Cluster { func newTestCluster(membs []*Member) *Cluster {
c := &Cluster{members: make(map[types.ID]*Member), removed: make(map[types.ID]bool)} c := &Cluster{members: make(map[types.ID]*Member), removed: make(map[types.ID]bool)}
c.store = store.New() c.store = store.New()
for i := range membs { for i := range membs {
c.AddMember(&membs[i]) c.AddMember(membs[i])
} }
return c return c
} }

12
etcdserver/sender_test.go
View File

@ -24,10 +24,10 @@ import (
) )
func TestSendHubInitSenders(t *testing.T) { func TestSendHubInitSenders(t *testing.T) {
membs := []Member{ membs := []*Member{
*newTestMember(1, []string{"http://a"}, "", nil), newTestMember(1, []string{"http://a"}, "", nil),
*newTestMember(2, []string{"http://b"}, "", nil), newTestMember(2, []string{"http://b"}, "", nil),
*newTestMember(3, []string{"http://c"}, "", nil), newTestMember(3, []string{"http://c"}, "", nil),
} }
cl := newTestCluster(membs) cl := newTestCluster(membs)
ls := stats.NewLeaderStats("") ls := stats.NewLeaderStats("")
@ -70,8 +70,8 @@ func TestSendHubAdd(t *testing.T) {
} }
func TestSendHubRemove(t *testing.T) { func TestSendHubRemove(t *testing.T) {
membs := []Member{ membs := []*Member{
*newTestMember(1, []string{"http://a"}, "", nil), newTestMember(1, []string{"http://a"}, "", nil),
} }
cl := newTestCluster(membs) cl := newTestCluster(membs)
ls := stats.NewLeaderStats("") ls := stats.NewLeaderStats("")

4
etcdserver/server_test.go
View File

@ -407,7 +407,7 @@ func TestApplyRequest(t *testing.T) {
} }
func TestApplyRequestOnAdminMemberAttributes(t *testing.T) { func TestApplyRequestOnAdminMemberAttributes(t *testing.T) {
cl := newTestCluster([]Member{{ID: 1}}) cl := newTestCluster([]*Member{{ID: 1}})
srv := &EtcdServer{ srv := &EtcdServer{
store: &storeRecorder{}, store: &storeRecorder{},
Cluster: cl, Cluster: cl,
@ -992,7 +992,7 @@ func TestRemoveMember(t *testing.T) {
Nodes: []uint64{1234, 2345, 3456}, Nodes: []uint64{1234, 2345, 3456},
}, },
} }
cl := newTestCluster([]Member{{ID: 1234}}) cl := newTestCluster([]*Member{{ID: 1234}})
s := &EtcdServer{ s := &EtcdServer{
node: n, node: n,
store: &storeRecorder{}, store: &storeRecorder{},