From 1af2b4cad74e9ad016d3b90416895e0bccdd2cf7 Mon Sep 17 00:00:00 2001 From: Yicheng Qin Date: Thu, 11 Jun 2015 09:40:53 -0700 Subject: [PATCH] rafthttp: fix TestUpdateMember Before this PR, it may error like this: ``` --- FAIL: TestUpdateMember-2 (0.00s) server_test.go:950: action = [{ApplyConfChange:ConfChangeUpdateNode []} {ProposeConfChange:ConfChangeUpdateNode []}], want [{ProposeConfChange:ConfChangeUpdateNode []} {ApplyConfChange:ConfChangeUpdateNode []}] ``` This fixes the test by recording the proposal event in time. --- etcdserver/server_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etcdserver/server_test.go b/etcdserver/server_test.go index e658c7ff5..d5f481e7a 100644 --- a/etcdserver/server_test.go +++ b/etcdserver/server_test.go @@ -1349,8 +1349,8 @@ func (n *nodeConfChangeCommitterRecorder) ProposeConfChange(ctx context.Context, return err } n.index++ - n.readyc <- raft.Ready{CommittedEntries: []raftpb.Entry{{Index: n.index, Type: raftpb.EntryConfChange, Data: data}}} n.Record(testutil.Action{Name: "ProposeConfChange:" + conf.Type.String()}) + n.readyc <- raft.Ready{CommittedEntries: []raftpb.Entry{{Index: n.index, Type: raftpb.EntryConfChange, Data: data}}} return nil } func (n *nodeConfChangeCommitterRecorder) Ready() <-chan raft.Ready {