From 7a1bdf96964bae21b1dffe51ca80676dafd133ba Mon Sep 17 00:00:00 2001
From: Alex Dadgar <alex.dadgar@gmail.com>
Date: Thu, 2 Feb 2017 17:50:06 -0800
Subject: [PATCH] Tests build

---
 nomad/heartbeat_test.go     |  2 +-
 nomad/leader_test.go        | 16 ++++++++--------
 nomad/node_endpoint_test.go |  2 +-
 nomad/serf_test.go          |  8 ++++----
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/nomad/heartbeat_test.go b/nomad/heartbeat_test.go
index 9e9659b03..d404f377f 100644
--- a/nomad/heartbeat_test.go
+++ b/nomad/heartbeat_test.go
@@ -199,7 +199,7 @@ func TestServer_HeartbeatTTL_Failover(t *testing.T) {
 
 	testutil.WaitForResult(func() (bool, error) {
 		peers, _ := s1.numPeers()
-		return len(peers) == 3, nil
+		return peers == 3, nil
 	}, func(err error) {
 		t.Fatalf("should have 3 peers")
 	})
diff --git a/nomad/leader_test.go b/nomad/leader_test.go
index 7f524db7b..e04c8b452 100644
--- a/nomad/leader_test.go
+++ b/nomad/leader_test.go
@@ -30,7 +30,7 @@ func TestLeader_LeftServer(t *testing.T) {
 	for _, s := range servers {
 		testutil.WaitForResult(func() (bool, error) {
 			peers, _ := s.numPeers()
-			return len(peers) == 3, nil
+			return peers == 3, nil
 		}, func(err error) {
 			t.Fatalf("should have 3 peers")
 		})
@@ -49,7 +49,7 @@ func TestLeader_LeftServer(t *testing.T) {
 
 		for _, s := range servers[1:] {
 			peers, _ := s.numPeers()
-			return len(peers) == 2, errors.New(fmt.Sprintf("%v", peers))
+			return peers == 2, errors.New(fmt.Sprintf("%v", peers))
 		}
 
 		return true, nil
@@ -77,7 +77,7 @@ func TestLeader_LeftLeader(t *testing.T) {
 	for _, s := range servers {
 		testutil.WaitForResult(func() (bool, error) {
 			peers, _ := s.numPeers()
-			return len(peers) == 3, nil
+			return peers == 3, nil
 		}, func(err error) {
 			t.Fatalf("should have 3 peers")
 		})
@@ -103,7 +103,7 @@ func TestLeader_LeftLeader(t *testing.T) {
 		}
 		testutil.WaitForResult(func() (bool, error) {
 			peers, _ := s.numPeers()
-			return len(peers) == 2, errors.New(fmt.Sprintf("%v", peers))
+			return peers == 2, errors.New(fmt.Sprintf("%v", peers))
 		}, func(err error) {
 			t.Fatalf("should have 2 peers: %v", err)
 		})
@@ -131,7 +131,7 @@ func TestLeader_MultiBootstrap(t *testing.T) {
 	// Ensure we don't have multiple raft peers
 	for _, s := range servers {
 		peers, _ := s.numPeers()
-		if len(peers) != 1 {
+		if peers != 1 {
 			t.Fatalf("should only have 1 raft peer!")
 		}
 	}
@@ -156,7 +156,7 @@ func TestLeader_PlanQueue_Reset(t *testing.T) {
 	for _, s := range servers {
 		testutil.WaitForResult(func() (bool, error) {
 			peers, _ := s.numPeers()
-			return len(peers) == 3, nil
+			return peers == 3, nil
 		}, func(err error) {
 			t.Fatalf("should have 3 peers")
 		})
@@ -233,7 +233,7 @@ func TestLeader_EvalBroker_Reset(t *testing.T) {
 	for _, s := range servers {
 		testutil.WaitForResult(func() (bool, error) {
 			peers, _ := s.numPeers()
-			return len(peers) == 3, nil
+			return peers == 3, nil
 		}, func(err error) {
 			t.Fatalf("should have 3 peers")
 		})
@@ -310,7 +310,7 @@ func TestLeader_PeriodicDispatcher_Restore_Adds(t *testing.T) {
 	for _, s := range servers {
 		testutil.WaitForResult(func() (bool, error) {
 			peers, _ := s.numPeers()
-			return len(peers) == 3, nil
+			return peers == 3, nil
 		}, func(err error) {
 			t.Fatalf("should have 3 peers")
 		})
diff --git a/nomad/node_endpoint_test.go b/nomad/node_endpoint_test.go
index 6c21bfb50..a865e5d01 100644
--- a/nomad/node_endpoint_test.go
+++ b/nomad/node_endpoint_test.go
@@ -537,7 +537,7 @@ func TestClientEndpoint_UpdateStatus_HeartbeatOnly(t *testing.T) {
 	for _, s := range servers {
 		testutil.WaitForResult(func() (bool, error) {
 			peers, _ := s.numPeers()
-			return len(peers) == 3, nil
+			return peers == 3, nil
 		}, func(err error) {
 			t.Fatalf("should have 3 peers")
 		})
diff --git a/nomad/serf_test.go b/nomad/serf_test.go
index 9574203e4..1b217dd07 100644
--- a/nomad/serf_test.go
+++ b/nomad/serf_test.go
@@ -106,14 +106,14 @@ func TestNomad_BootstrapExpect(t *testing.T) {
 	testJoin(t, s1, s2)
 
 	testutil.WaitForResult(func() (bool, error) {
-		peers, err := s1.numOtherPeers()
+		peers, err := s1.numPeers()
 		if err != nil {
 			return false, err
 		}
 		if peers != 1 {
 			return false, fmt.Errorf("bad: %#v", peers)
 		}
-		peers, err = s2.numOtherPeers()
+		peers, err = s2.numPeers()
 		if err != nil {
 			return false, err
 		}
@@ -163,8 +163,8 @@ func TestNomad_BadExpect(t *testing.T) {
 	testutil.WaitForResult(func() (bool, error) {
 		for _, s := range servers {
 			p, _ := s.numPeers()
-			if len(p) != 0 {
-				return false, fmt.Errorf("%d", len(p))
+			if p != 0 {
+				return false, fmt.Errorf("%d", p)
 			}
 		}
 		return true, nil