Proof of concept using WaitForResult in tests

consul/catalog_endpoint_test.go

@@ -2,6 +2,7 @@ package consul
 
 import (
 	"fmt"
+	"github.com/hashicorp/consul/testutil"
 	"github.com/hashicorp/consul/consul/structs"
 	"net/rpc"
 	"os"
@@ -35,12 +36,12 @@ func TestCatalogRegister(t *testing.T) {
 		t.Fatalf("err: %v", err)
 	}
 
-	// Wait for leader
+	testutil.WaitForResult(func() (bool, error) {
-	time.Sleep(100 * time.Millisecond)
+		err := client.Call("Catalog.Register", &arg, &out)
-
+		return err == nil, err
-	if err := client.Call("Catalog.Register", &arg, &out); err != nil {
+	}, func(err error) {
 		t.Fatalf("err: %v", err)
-	}
+	})
 }
 
 func TestCatalogRegister_ForwardLeader(t *testing.T) {

testutil/wait.go

@@ -0,0 +1,26 @@
+package testutil
+
+import (
+	"time"
+)
+
+type testFn func() (bool, error)
+type errorFn func(error)
+
+func WaitForResult(test testFn, error errorFn) {
+	retries := 500  // 5 seconds timeout
+
+	for retries > 0 {
+		time.Sleep(10 * time.Millisecond)
+		retries--
+
+		success, err := test()
+		if success {
+			return
+		}
+
+		if retries == 0 {
+			error(err)
+		}
+	}
+}