Merge pull request #2684 from hashicorp/b-early-acls

Fixes up ACL timing issues with unit tests.

api/agent_test.go

@@ -1,6 +1,7 @@
 package api
 
 import (
+	"io"
 	"io/ioutil"
 	"strings"
 	"testing"
@@ -610,7 +611,9 @@ func TestAgent_Leave(t *testing.T) {
 		t.Fatalf("err: %v", err)
 	}
 
-	if err := c2.Agent().Leave(); err != nil {
+	// We sometimes see an EOF response to this one, depending on timing.
+	err := c2.Agent().Leave()
+	if err != nil && err != io.EOF {
 		t.Fatalf("err: %v", err)
 	}
 

testutil/server.go

@@ -336,7 +336,6 @@ func (s *TestServer) waitForLeader() {
 		if _, ok := taggedAddresses["lan"]; !ok {
 			return false, fmt.Errorf("No lan tagged addresses")
 		}
-
 		return true, nil
 	}, func(err error) {
 		defer s.Stop()

testutil/wait.go

@@ -1,6 +1,7 @@
 package testutil
 
 import (
+	"fmt"
 	"testing"
 	"time"
 
@@ -22,6 +23,7 @@ func WaitForResult(try testFn, fail errorFn) {
 		var success bool
 		success, err = try()
 		if success {
+			time.Sleep(25 * time.Millisecond)
 			return
 		}
 
@@ -39,11 +41,20 @@ type rpcFn func(string, interface{}, interface{}) error
 func WaitForLeader(t *testing.T, rpc rpcFn, dc string) structs.IndexedNodes {
 	var out structs.IndexedNodes
 	WaitForResult(func() (bool, error) {
+		// Ensure we have a leader and a node registration.
 		args := &structs.DCSpecificRequest{
 			Datacenter: dc,
 		}
-		err := rpc("Catalog.ListNodes", args, &out)
+		if err := rpc("Catalog.ListNodes", args, &out); err != nil {
-		return out.QueryMeta.KnownLeader && out.Index > 0, err
+			return false, fmt.Errorf("Catalog.ListNodes failed: %v", err)
+		}
+		if !out.QueryMeta.KnownLeader {
+			return false, fmt.Errorf("No leader")
+		}
+		if out.Index == 0 {
+			return false, fmt.Errorf("Consul index is 0")
+		}
+		return true, nil
 	}, func(err error) {
 		t.Fatalf("failed to find leader: %v", err)
 	})