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

etcdserver: remove unnecessary newTestMemberp

Browse Source
This commit is contained in:
Xiang Li
2014-11-11 11:09:33 -08:00
parent 077e144e8a
commit e4931e0c47
4 changed files with 65 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
etcdserver/cluster_test.go
View File

@ -36,9 +36,9 @@ func TestClusterFromString(t *testing.T) {
{ {
"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(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(12762790032478827328, []string{"http://127.0.0.1:2379"}, "default", nil), *newTestMember(12762790032478827328, []string{"http://127.0.0.1:2379"}, "default", nil),
}, },
}, },
} }
@ -83,15 +83,15 @@ func TestClusterFromStore(t *testing.T) {
mems []Member mems []Member
}{ }{
{ {
[]Member{newTestMember(1, nil, "node1", nil)}, []Member{*newTestMember(1, nil, "node1", nil)},
}, },
{ {
[]Member{}, []Member{},
}, },
{ {
[]Member{ []Member{
newTestMember(1, nil, "node1", nil), *newTestMember(1, nil, "node1", nil),
newTestMember(2, nil, "node2", nil), *newTestMember(2, nil, "node2", nil),
}, },
}, },
} }
@ -113,8 +113,8 @@ func TestClusterFromStore(t *testing.T) {
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
@ -138,8 +138,8 @@ 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
@ -163,9 +163,9 @@ 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()
@ -182,7 +182,7 @@ func TestClusterPeerURLs(t *testing.T) {
// 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"},
}, },
@ -190,7 +190,7 @@ func TestClusterPeerURLs(t *testing.T) {
// 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"},
}, },
@ -198,9 +198,9 @@ func TestClusterPeerURLs(t *testing.T) {
// 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"},
}, },
@ -214,7 +214,7 @@ func TestClusterPeerURLs(t *testing.T) {
// 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{},
}, },
@ -237,7 +237,7 @@ func TestClusterClientURLs(t *testing.T) {
// 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"},
}, },
@ -245,7 +245,7 @@ func TestClusterClientURLs(t *testing.T) {
// 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"},
}, },
@ -253,9 +253,9 @@ func TestClusterClientURLs(t *testing.T) {
// 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"},
}, },
@ -269,7 +269,7 @@ func TestClusterClientURLs(t *testing.T) {
// 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{},
}, },
@ -292,28 +292,28 @@ func TestClusterValidateAndAssignIDsBad(t *testing.T) {
{ {
// 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{
newTestMemberp(1, []string{"http://127.0.0.1:4001"}, "", nil), newTestMember(1, []string{"http://127.0.0.1:4001"}, "", nil),
}, },
}, },
{ {
// 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{
newTestMemberp(1, []string{"http://127.0.0.1:2379"}, "", nil), newTestMember(1, []string{"http://127.0.0.1:2379"}, "", nil),
newTestMemberp(2, []string{"http://127.0.0.2:4001"}, "", nil), newTestMember(2, []string{"http://127.0.0.2:4001"}, "", nil),
}, },
}, },
} }
@ -333,12 +333,12 @@ func TestClusterValidateAndAssignIDs(t *testing.T) {
}{ }{
{ {
[]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{
newTestMemberp(3, []string{"http://127.0.0.1:2379"}, "", nil), newTestMember(3, []string{"http://127.0.0.1:2379"}, "", nil),
newTestMemberp(4, []string{"http://127.0.0.2:2379"}, "", nil), newTestMember(4, []string{"http://127.0.0.2:2379"}, "", nil),
}, },
[]types.ID{3, 4}, []types.ID{3, 4},
}, },
@ -427,8 +427,8 @@ 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()
@ -438,7 +438,7 @@ func TestClusterGenID(t *testing.T) {
previd := cs.ID() previd := cs.ID()
cs.SetStore(&storeRecorder{}) cs.SetStore(&storeRecorder{})
cs.AddMember(newTestMemberp(3, nil, "", nil)) cs.AddMember(newTestMember(3, nil, "", nil))
cs.genID() cs.genID()
if cs.ID() == previd { if cs.ID() == previd {
t.Fatalf("cluster.ID = %v, want not %v", cs.ID(), previd) t.Fatalf("cluster.ID = %v, want not %v", cs.ID(), previd)
@ -481,7 +481,7 @@ func TestClusterAddMember(t *testing.T) {
st := &storeRecorder{} st := &storeRecorder{}
c := newTestCluster(nil) c := newTestCluster(nil)
c.SetStore(st) c.SetStore(st)
c.AddMember(newTestMemberp(1, nil, "node1", nil)) c.AddMember(newTestMember(1, nil, "node1", nil))
wactions := []action{ wactions := []action{
{ {
@ -535,32 +535,32 @@ func TestClusterMembers(t *testing.T) {
func TestClusterString(t *testing.T) { func TestClusterString(t *testing.T) {
cls := &Cluster{ cls := &Cluster{
members: map[types.ID]*Member{ members: map[types.ID]*Member{
1: newTestMemberp( 1: newTestMember(
1, 1,
[]string{"http://1.1.1.1:1111", "http://0.0.0.0:0000"}, []string{"http://1.1.1.1:1111", "http://0.0.0.0:0000"},
"abc", "abc",
nil, nil,
), ),
2: newTestMemberp( 2: newTestMember(
2, 2,
[]string{"http://2.2.2.2:2222"}, []string{"http://2.2.2.2:2222"},
"def", "def",
nil, nil,
), ),
3: newTestMemberp( 3: newTestMember(
3, 3,
[]string{"http://3.3.3.3:1234", "http://127.0.0.1:7001"}, []string{"http://3.3.3.3:1234", "http://127.0.0.1:7001"},
"ghi", "ghi",
nil, nil,
), ),
// no PeerURLs = not included // no PeerURLs = not included
4: newTestMemberp( 4: newTestMember(
4, 4,
[]string{}, []string{},
"four", "four",
nil, nil,
), ),
5: newTestMemberp( 5: newTestMember(
5, 5,
nil, nil,
"five", "five",

21
etcdserver/member_test.go
View File

@ -63,7 +63,7 @@ func TestMemberPick(t *testing.T) {
urls map[string]bool urls map[string]bool
}{ }{
{ {
newTestMemberp(1, []string{"abc", "def", "ghi", "jkl", "mno", "pqr", "stu"}, "", nil), newTestMember(1, []string{"abc", "def", "ghi", "jkl", "mno", "pqr", "stu"}, "", nil),
map[string]bool{ map[string]bool{
"abc": true, "abc": true,
"def": true, "def": true,
@ -75,7 +75,7 @@ func TestMemberPick(t *testing.T) {
}, },
}, },
{ {
newTestMemberp(2, []string{"xyz"}, "", nil), newTestMember(2, []string{"xyz"}, "", nil),
map[string]bool{"xyz": true}, map[string]bool{"xyz": true},
}, },
} }
@ -92,10 +92,10 @@ func TestMemberPick(t *testing.T) {
func TestMemberClone(t *testing.T) { func TestMemberClone(t *testing.T) {
tests := []*Member{ tests := []*Member{
newTestMemberp(1, nil, "abc", nil), newTestMember(1, nil, "abc", nil),
newTestMemberp(1, []string{"http://a"}, "abc", nil), newTestMember(1, []string{"http://a"}, "abc", nil),
newTestMemberp(1, nil, "abc", []string{"http://b"}), newTestMember(1, nil, "abc", []string{"http://b"}),
newTestMemberp(1, []string{"http://a"}, "abc", []string{"http://b"}), newTestMember(1, []string{"http://a"}, "abc", []string{"http://b"}),
} }
for i, tt := range tests { for i, tt := range tests {
nm := tt.Clone() nm := tt.Clone()
@ -108,15 +108,10 @@ func TestMemberClone(t *testing.T) {
} }
} }
func newTestMember(id uint64, peerURLs []string, name string, clientURLs []string) Member { func newTestMember(id uint64, peerURLs []string, name string, clientURLs []string) *Member {
return Member{ return &Member{
ID: types.ID(id), ID: types.ID(id),
RaftAttributes: RaftAttributes{PeerURLs: peerURLs}, RaftAttributes: RaftAttributes{PeerURLs: peerURLs},
Attributes: Attributes{Name: name, ClientURLs: clientURLs}, Attributes: Attributes{Name: name, ClientURLs: clientURLs},
} }
} }
func newTestMemberp(id uint64, peerURLs []string, name string, clientURLs []string) *Member {
m := newTestMember(id, peerURLs, name, clientURLs)
return &m
}

10
etcdserver/sender_test.go
View File

@ -25,9 +25,9 @@ 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("")
@ -48,7 +48,7 @@ func TestSendHubAdd(t *testing.T) {
cl := newTestCluster(nil) cl := newTestCluster(nil)
ls := stats.NewLeaderStats("") ls := stats.NewLeaderStats("")
h := newSendHub(nil, cl, nil, ls) h := newSendHub(nil, cl, nil, ls)
m := newTestMemberp(1, []string{"http://a"}, "", nil) m := newTestMember(1, []string{"http://a"}, "", nil)
h.Add(m) h.Add(m)
if _, ok := ls.Followers["1"]; !ok { if _, ok := ls.Followers["1"]; !ok {
@ -71,7 +71,7 @@ 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("")

14
etcdserver/server_test.go
View File

@ -1101,25 +1101,25 @@ func TestGetOtherPeerURLs(t *testing.T) {
}{ }{
{ {
[]*Member{ []*Member{
newTestMemberp(1, []string{"http://10.0.0.1"}, "a", nil), newTestMember(1, []string{"http://10.0.0.1"}, "a", nil),
}, },
"a", "a",
[]string{}, []string{},
}, },
{ {
[]*Member{ []*Member{
newTestMemberp(1, []string{"http://10.0.0.1"}, "a", nil), newTestMember(1, []string{"http://10.0.0.1"}, "a", nil),
newTestMemberp(2, []string{"http://10.0.0.2"}, "b", nil), newTestMember(2, []string{"http://10.0.0.2"}, "b", nil),
newTestMemberp(3, []string{"http://10.0.0.3"}, "c", nil), newTestMember(3, []string{"http://10.0.0.3"}, "c", nil),
}, },
"a", "a",
[]string{"http://10.0.0.2", "http://10.0.0.3"}, []string{"http://10.0.0.2", "http://10.0.0.3"},
}, },
{ {
[]*Member{ []*Member{
newTestMemberp(1, []string{"http://10.0.0.1"}, "a", nil), newTestMember(1, []string{"http://10.0.0.1"}, "a", nil),
newTestMemberp(3, []string{"http://10.0.0.3"}, "c", nil), newTestMember(3, []string{"http://10.0.0.3"}, "c", nil),
newTestMemberp(2, []string{"http://10.0.0.2"}, "b", nil), newTestMember(2, []string{"http://10.0.0.2"}, "b", nil),
}, },
"a", "a",
[]string{"http://10.0.0.2", "http://10.0.0.3"}, []string{"http://10.0.0.2", "http://10.0.0.3"},