Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6557 from heyitsanthony/fix-publish-retry

Browse Source 
etcdserver: use stream recorder for TestPublishRetry
This commit is contained in:
Gyu-Ho Lee 2016-09-30 18:40:18 -07:00 committed by GitHub
commit 37bd0932f7
1 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
etcdserver/server_test.go
View File

@ -1227,7 +1227,7 @@ func TestPublishStopped(t *testing.T) {
// TestPublishRetry tests that publish will keep retry until success. // TestPublishRetry tests that publish will keep retry until success.
func TestPublishRetry(t *testing.T) { func TestPublishRetry(t *testing.T) {
n := newNodeRecorder() n := newNodeRecorderStream()
srv := &EtcdServer{ srv := &EtcdServer{
Cfg: &ServerConfig{TickMs: 1}, Cfg: &ServerConfig{TickMs: 1},
r: raftNode{Node: n}, r: raftNode{Node: n},
@ -1235,15 +1235,27 @@ func TestPublishRetry(t *testing.T) {
stopping: make(chan struct{}), stopping: make(chan struct{}),
reqIDGen: idutil.NewGenerator(0, time.Time{}), reqIDGen: idutil.NewGenerator(0, time.Time{}),
} }
// TODO: use fakeClockwork // expect multiple proposals from retrying
time.AfterFunc(10*time.Millisecond, func() { close(srv.stopping) }) ch := make(chan struct{})
go func() {
defer close(ch)
if action, err := n.Wait(2); err != nil {
t.Errorf("len(action) = %d, want >= 2 (%v)", len(action), err)
}
close(srv.stopping)
// drain remaing actions, if any, so publish can terminate
for {
select {
case <-ch:
return
default:
n.Action()
}
}
}()
srv.publish(10 * time.Nanosecond) srv.publish(10 * time.Nanosecond)
ch <- struct{}{}
action := n.Action() <-ch
// multiple Proposes
if cnt := len(action); cnt < 2 {
t.Errorf("len(action) = %d, want >= 2", cnt)
}
} }
func TestUpdateVersion(t *testing.T) { func TestUpdateVersion(t *testing.T) {
@ -1350,8 +1362,9 @@ func TestGetOtherPeerURLs(t *testing.T) {
type nodeRecorder struct{ testutil.Recorder } type nodeRecorder struct{ testutil.Recorder }
func newNodeRecorder() *nodeRecorder { return &nodeRecorder{&testutil.RecorderBuffered{}} } func newNodeRecorder() *nodeRecorder { return &nodeRecorder{&testutil.RecorderBuffered{}} }
func newNodeNop() raft.Node { return newNodeRecorder() } func newNodeRecorderStream() *nodeRecorder { return &nodeRecorder{testutil.NewRecorderStream()} }
func newNodeNop() raft.Node { return newNodeRecorder() }
func (n *nodeRecorder) Tick() { n.Record(testutil.Action{Name: "Tick"}) } func (n *nodeRecorder) Tick() { n.Record(testutil.Action{Name: "Tick"}) }
func (n *nodeRecorder) Campaign(ctx context.Context) error { func (n *nodeRecorder) Campaign(ctx context.Context) error {