Merge pull request #4327 from gyuho/minor_govet

integration: fix shadowed variables (based govet)

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{}{}

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)
 	}