From b7443ad8496b2302d97221b3d27b06b81616b626 Mon Sep 17 00:00:00 2001 From: Gyuho Lee Date: Wed, 9 May 2018 13:55:32 -0700 Subject: [PATCH] integration: remove unused parameters Signed-off-by: Gyuho Lee --- integration/bridge.go | 6 +++--- integration/cluster.go | 6 +++--- integration/network_partition_test.go | 6 +++--- integration/v3_leadership_test.go | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/integration/bridge.go b/integration/bridge.go index 9792ba89f..a61c1b4cc 100644 --- a/integration/bridge.go +++ b/integration/bridge.go @@ -155,12 +155,12 @@ func (b *bridge) serveConn(bc *bridgeConn) { var wg sync.WaitGroup wg.Add(2) go func() { - b.ioCopy(bc, bc.out, bc.in) + b.ioCopy(bc.out, bc.in) bc.close() wg.Done() }() go func() { - b.ioCopy(bc, bc.in, bc.out) + b.ioCopy(bc.in, bc.out) bc.close() wg.Done() }() @@ -200,7 +200,7 @@ func (b *bridge) Unblackhole() { } // ref. https://github.com/golang/go/blob/master/src/io/io.go copyBuffer -func (b *bridge) ioCopy(bc *bridgeConn, dst io.Writer, src io.Reader) (err error) { +func (b *bridge) ioCopy(dst io.Writer, src io.Reader) (err error) { buf := make([]byte, 32*1024) for { select { diff --git a/integration/cluster.go b/integration/cluster.go index 6e03a4ae2..ccd232f6f 100644 --- a/integration/cluster.go +++ b/integration/cluster.go @@ -450,10 +450,10 @@ func (c *cluster) waitLeader(t *testing.T, membs []*member) int { return -1 } -func (c *cluster) WaitNoLeader(t *testing.T) { c.waitNoLeader(t, c.Members) } +func (c *cluster) WaitNoLeader() { c.waitNoLeader(c.Members) } // waitNoLeader waits until given members lose leader. -func (c *cluster) waitNoLeader(t *testing.T, membs []*member) { +func (c *cluster) waitNoLeader(membs []*member) { noLeader := false for !noLeader { noLeader = true @@ -992,7 +992,7 @@ func (m *member) Stop(t *testing.T) { } // checkLeaderTransition waits for leader transition, returning the new leader ID. -func checkLeaderTransition(t *testing.T, m *member, oldLead uint64) uint64 { +func checkLeaderTransition(m *member, oldLead uint64) uint64 { interval := time.Duration(m.s.Cfg.TickMs) * time.Millisecond for m.s.Lead() == 0 || (m.s.Lead() == oldLead) { time.Sleep(interval) diff --git a/integration/network_partition_test.go b/integration/network_partition_test.go index cfbdda02a..db542943d 100644 --- a/integration/network_partition_test.go +++ b/integration/network_partition_test.go @@ -41,7 +41,7 @@ func TestNetworkPartition5MembersLeaderInMinority(t *testing.T) { injectPartition(t, minorityMembers, majorityMembers) // minority leader must be lost - clus.waitNoLeader(t, minorityMembers) + clus.waitNoLeader(minorityMembers) // wait extra election timeout time.Sleep(2 * majorityMembers[0].ElectionTimeout()) @@ -89,7 +89,7 @@ func testNetworkPartition5MembersLeaderInMajority(t *testing.T) error { injectPartition(t, majorityMembers, minorityMembers) // minority leader must be lost - clus.waitNoLeader(t, minorityMembers) + clus.waitNoLeader(minorityMembers) // wait extra election timeout time.Sleep(2 * majorityMembers[0].ElectionTimeout()) @@ -128,7 +128,7 @@ func TestNetworkPartition4Members(t *testing.T) { injectPartition(t, leaderPartition, followerPartition) // no group has quorum, so leader must be lost in all members - clus.WaitNoLeader(t) + clus.WaitNoLeader() // recover network partition (bi-directional) recoverPartition(t, leaderPartition, followerPartition) diff --git a/integration/v3_leadership_test.go b/integration/v3_leadership_test.go index 7f41f3bfe..93c7f3ca6 100644 --- a/integration/v3_leadership_test.go +++ b/integration/v3_leadership_test.go @@ -41,7 +41,7 @@ func testMoveLeader(t *testing.T, auto bool) { for i := range clus.Members { if oldLeadIdx != i { go func(m *member) { - idc <- checkLeaderTransition(t, m, oldLeadID) + idc <- checkLeaderTransition(m, oldLeadID) }(clus.Members[i]) } }