From 599ecebdec003d0620f919adfd0bbd684b150de8 Mon Sep 17 00:00:00 2001 From: Gyu-Ho Lee Date: Thu, 28 Jan 2016 11:42:58 -0800 Subject: [PATCH] integration: fix shadowed variables based on govet --- integration/v3_double_barrier_test.go | 6 +++--- integration/v3_election_test.go | 9 +++++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/integration/v3_double_barrier_test.go b/integration/v3_double_barrier_test.go index 32887040a..14e4bc4a6 100644 --- a/integration/v3_double_barrier_test.go +++ b/integration/v3_double_barrier_test.go @@ -31,12 +31,12 @@ func TestDoubleBarrier(t *testing.T) { donec := make(chan struct{}) for i := 0; i < waiters-1; i++ { go func() { - b := recipe.NewDoubleBarrier(clus.RandClient(), "test-barrier", waiters) - if err := b.Enter(); err != nil { + bb := recipe.NewDoubleBarrier(clus.RandClient(), "test-barrier", waiters) + if err := bb.Enter(); err != nil { t.Fatalf("could not enter on barrier (%v)", err) } donec <- struct{}{} - if err := b.Leave(); err != nil { + if err := bb.Leave(); err != nil { t.Fatalf("could not leave on barrier (%v)", err) } donec <- struct{}{} diff --git a/integration/v3_election_test.go b/integration/v3_election_test.go index 9b527245a..1e315b1cd 100644 --- a/integration/v3_election_test.go +++ b/integration/v3_election_test.go @@ -108,15 +108,16 @@ func TestElectionFailover(t *testing.T) { // next leader electedc := make(chan struct{}) go func() { - e := recipe.NewElection(clus.clients[1], "test-election") - if err := e.Volunteer("bar"); err != nil { - t.Fatal(err) + ee := recipe.NewElection(clus.clients[1], "test-election") + if eer := ee.Volunteer("bar"); eer != nil { + t.Fatal(eer) } electedc <- struct{}{} }() // invoke leader failover - if err := recipe.RevokeSessionLease(clus.clients[0]); err != nil { + err = recipe.RevokeSessionLease(clus.clients[0]) + if err != nil { t.Fatal(err) }