From c6b3cae106f54b248f38892e641c1579a51bbfe7 Mon Sep 17 00:00:00 2001
From: Chavez <matthew@el-chavez.me>
Date: Thu, 4 Dec 2014 21:32:59 -0800
Subject: [PATCH] consul: Fix failing globalRPC test

---
 consul/server_test.go | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/consul/server_test.go b/consul/server_test.go
index 0d0d1d588..8c61d2514 100644
--- a/consul/server_test.go
+++ b/consul/server_test.go
@@ -489,6 +489,12 @@ func TestServer_globalRPCErrors(t *testing.T) {
 	defer os.RemoveAll(dir1)
 	defer s1.Shutdown()
 
+	testutil.WaitForResult(func() (bool, error) {
+		return len(s1.remoteConsuls) == 1, nil
+	}, func(err error) {
+		t.Fatalf("Server did not join LAN successfully")
+	})
+
 	// Check that an error from a remote DC is returned
 	err := s1.globalRPC("Bad.Method", nil, &fakeGlobalResp{})
 	if err == nil {