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

integration: fix decrease cluster tests

Browse Source
This commit is contained in:
Yicheng Qin 2015-02-21 18:18:57 -08:00
parent 1c5a507761
commit 87e3de8b8b
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
integration/cluster_test.go
View File

@ -346,8 +346,10 @@ func (c *cluster) RemoveMember(t *testing.T, id uint64) {
select { select {
case <-m.s.StopNotify(): case <-m.s.StopNotify():
m.Terminate(t) m.Terminate(t)
// 1s stop delay + election timeout + 1s disk and network delay // 1s stop delay + election timeout + 1s disk and network delay + connection write timeout
case <-time.After(time.Second + time.Duration(electionTicks)*tickDuration + time.Second): // TODO: remove connection write timeout by selecting on http response closeNotifier
// blocking on https://github.com/golang/go/issues/9524
case <-time.After(time.Second + time.Duration(electionTicks)*tickDuration + time.Second + rafthttp.ConnWriteTimeout):
t.Fatalf("failed to remove member %s in time", m.s.ID()) t.Fatalf("failed to remove member %s in time", m.s.ID())
} }
} }