Skip to content

Commit ba0b6ac

Browse files
committed
Fix failed unit test cases
Signed-off-by: Benjamin Wang <[email protected]>
1 parent 6ee8abe commit ba0b6ac

File tree

2 files changed

+31
-3
lines changed

2 files changed

+31
-3
lines changed

server/etcdserver/api/membership/cluster_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -491,7 +491,7 @@ func TestClusterAddMember(t *testing.T) {
491491
st := mockstore.NewRecorder()
492492
c := newTestCluster(t, nil)
493493
c.SetStore(st)
494-
c.AddMember(newTestMember(1, nil, "node1", nil), true)
494+
c.AddMember(newTestMember(1, nil, "", nil), true)
495495

496496
wactions := []testutil.Action{
497497
{
@@ -514,7 +514,7 @@ func TestClusterAddMemberAsLearner(t *testing.T) {
514514
st := mockstore.NewRecorder()
515515
c := newTestCluster(t, nil)
516516
c.SetStore(st)
517-
c.AddMember(newTestMemberAsLearner(1, nil, "node1", nil), true)
517+
c.AddMember(newTestMemberAsLearner(1, nil, "", nil), true)
518518

519519
wactions := []testutil.Action{
520520
{

server/etcdserver/server_test.go

+29-1
Original file line numberDiff line numberDiff line change
@@ -599,6 +599,11 @@ func TestApplyConfChangeError(t *testing.T) {
599599
func TestApplyConfChangeShouldStop(t *testing.T) {
600600
cl := membership.NewCluster(zaptest.NewLogger(t))
601601
cl.SetStore(v2store.New())
602+
603+
be, _ := betesting.NewDefaultTmpBackend(t)
604+
defer betesting.Close(t, be)
605+
cl.SetBackend(be)
606+
602607
for i := 1; i <= 3; i++ {
603608
cl.AddMember(&membership.Member{ID: types.ID(i)}, true)
604609
}
@@ -647,12 +652,15 @@ func TestApplyConfigChangeUpdatesConsistIndex(t *testing.T) {
647652

648653
cl := membership.NewCluster(zaptest.NewLogger(t))
649654
cl.SetStore(v2store.New())
650-
cl.AddMember(&membership.Member{ID: types.ID(1)}, true)
651655

652656
be, _ := betesting.NewDefaultTmpBackend(t)
653657
defer betesting.Close(t, be)
658+
cl.SetBackend(be)
659+
654660
cindex.CreateMetaBucket(be.BatchTx())
655661

662+
cl.AddMember(&membership.Member{ID: types.ID(1)}, true)
663+
656664
ci := cindex.NewConsistentIndex(be)
657665
srv := &EtcdServer{
658666
lgMu: new(sync.RWMutex),
@@ -733,6 +741,11 @@ func TestApplyMultiConfChangeShouldStop(t *testing.T) {
733741
lg := zaptest.NewLogger(t)
734742
cl := membership.NewCluster(lg)
735743
cl.SetStore(v2store.New())
744+
745+
be, _ := betesting.NewDefaultTmpBackend(t)
746+
defer betesting.Close(t, be)
747+
cl.SetBackend(be)
748+
736749
for i := 1; i <= 5; i++ {
737750
cl.AddMember(&membership.Member{ID: types.ID(i)}, true)
738751
}
@@ -1352,6 +1365,11 @@ func TestAddMember(t *testing.T) {
13521365
cl := newTestCluster(t, nil)
13531366
st := v2store.New()
13541367
cl.SetStore(st)
1368+
1369+
be, _ := betesting.NewDefaultTmpBackend(t)
1370+
defer betesting.Close(t, be)
1371+
cl.SetBackend(be)
1372+
13551373
r := newRaftNode(raftNodeConfig{
13561374
lg: lg,
13571375
Node: n,
@@ -1453,6 +1471,11 @@ func TestRemoveMember(t *testing.T) {
14531471
cl := newTestCluster(t, nil)
14541472
st := v2store.New()
14551473
cl.SetStore(v2store.New())
1474+
1475+
be, _ := betesting.NewDefaultTmpBackend(t)
1476+
defer betesting.Close(t, be)
1477+
cl.SetBackend(be)
1478+
14561479
cl.AddMember(&membership.Member{ID: 1234}, true)
14571480
r := newRaftNode(raftNodeConfig{
14581481
lg: lg,
@@ -1499,6 +1522,11 @@ func TestUpdateMember(t *testing.T) {
14991522
cl := newTestCluster(t, nil)
15001523
st := v2store.New()
15011524
cl.SetStore(st)
1525+
1526+
be, _ := betesting.NewDefaultTmpBackend(t)
1527+
defer betesting.Close(t, be)
1528+
cl.SetBackend(be)
1529+
15021530
cl.AddMember(&membership.Member{ID: 1234}, true)
15031531
r := newRaftNode(raftNodeConfig{
15041532
lg: lg,

0 commit comments

Comments
 (0)