Merge pull request #8783 from gyuho/election-timeout

integration: expose ElectionTimeout method
etcd-io · Oct 30, 2017 · 2200450 · 2200450
2 parents 87ad10c + a41f3b6
commit 2200450
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/integration/cluster.go b/integration/cluster.go
@@ -608,8 +608,8 @@ func (m *member) listenGRPC() error {
 	return nil
 }
 
-func (m *member) electionTimeout() time.Duration {
-	return time.Duration(m.s.Cfg.ElectionTicks) * time.Millisecond
+func (m *member) ElectionTimeout() time.Duration {
+	return time.Duration(m.s.Cfg.ElectionTicks*int(m.s.Cfg.TickMs)) * time.Millisecond
 }
 
 func (m *member) ID() types.ID { return m.s.ID() }

diff --git a/integration/network_partition_test.go b/integration/network_partition_test.go
@@ -44,7 +44,7 @@ func TestNetworkPartition5MembersLeaderInMinority(t *testing.T) {
 	clus.waitNoLeader(t, minorityMembers)
 
 	// wait extra election timeout
-	time.Sleep(2 * majorityMembers[0].electionTimeout())
+	time.Sleep(2 * majorityMembers[0].ElectionTimeout())
 
 	// new leader must be from majority
 	clus.waitLeader(t, majorityMembers)
@@ -92,7 +92,7 @@ func testNetworkPartition5MembersLeaderInMajority(t *testing.T) error {
 	clus.waitNoLeader(t, minorityMembers)
 
 	// wait extra election timeout
-	time.Sleep(2 * majorityMembers[0].electionTimeout())
+	time.Sleep(2 * majorityMembers[0].ElectionTimeout())
 
 	// leader must be hold in majority
 	leadIndex2 := clus.waitLeader(t, majorityMembers)