fix tests (hashicorp#391)

* fix TestRaft_LeaderLeaseExpire
* fix TestRaft_LeadershipTransferLeaderRejectsClientRequests

raft_test.go

@@ -1490,13 +1490,17 @@ func TestRaft_LeaderLeaseExpire(t *testing.T) {
 	c.Disconnect(follower.localAddr)
 
 	// Watch the leaderCh
-	select {
-	case v := <-leader.LeaderCh():
-		if v {
-			c.FailNowf("should step down as leader")
+	timeout := time.After(conf.LeaderLeaseTimeout * 2)
+LOOP:
+	for {
+		select {
+		case v := <-leader.LeaderCh():
+			if !v {
+				break LOOP
+			}
+		case <-timeout:
+			c.FailNowf("timeout stepping down as leader")
 		}
-	case <-time.After(conf.LeaderLeaseTimeout * 2):
-		c.FailNowf("timeout stepping down as leader")
 	}
 
 	// Ensure the last contact of the leader is non-zero
@@ -2027,7 +2031,6 @@ func TestRaft_LeadershipTransferLeaderRejectsClientRequests(t *testing.T) {
 		l.Apply([]byte("test"), 0),
 		l.Barrier(0),
 		l.DemoteVoter(ServerID(""), 0, 0),
-		l.GetConfiguration(),
 
 		// the API is tested, but here we are making sure we reject any config change.
 		l.requestConfigChange(configurationChangeRequest{}, 100*time.Millisecond),