From 36f216cb7cb16958d98b3d77e121198596fd2213 Mon Sep 17 00:00:00 2001
From: Corey Hulen <corey@hulen.com>
Date: Mon, 19 Jun 2017 08:44:04 -0700
Subject: PLT-6080 moving clustering to memberlist (#6499)

* PLT-6080 adding cluster discovery service

* Adding memberlist lib

* Adding memberlist lib

* WIP

* WIP

* WIP

* WIP

* Rolling back config changes

* Fixing make file

* Fixing config for cluster

* WIP

* Fixing system console for clustering

* Fixing default config

* Fixing config

* Fixing system console for clustering

* Tweaking hub setting

* Bumping up time

* merging vendor dir

* Updating vendor dir

* Fixing unit test

* Fixing bad merge

* Remove some testing code

* Moving comment

* PLT-6868 adding db ping retry

* Removing unused loc strings

* Adding defer to cancel
---
 model/cluster_info_test.go | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

(limited to 'model/cluster_info_test.go')

diff --git a/model/cluster_info_test.go b/model/cluster_info_test.go
index 038927120..c019df40a 100644
--- a/model/cluster_info_test.go
+++ b/model/cluster_info_test.go
@@ -9,33 +9,23 @@ import (
 )
 
 func TestClusterInfoJson(t *testing.T) {
-	cluster := ClusterInfo{Id: NewId(), InterNodeUrl: NewId(), Hostname: NewId()}
+	cluster := ClusterInfo{IpAddress: NewId(), Hostname: NewId()}
 	json := cluster.ToJson()
 	result := ClusterInfoFromJson(strings.NewReader(json))
 
-	if cluster.Id != result.Id {
+	if cluster.IpAddress != result.IpAddress {
 		t.Fatal("Ids do not match")
 	}
-
-	cluster.SetAlive(true)
-	if !cluster.IsAlive() {
-		t.Fatal("should be live")
-	}
-
-	cluster.SetAlive(false)
-	if cluster.IsAlive() {
-		t.Fatal("should be not live")
-	}
 }
 
 func TestClusterInfosJson(t *testing.T) {
-	cluster := ClusterInfo{Id: NewId(), InterNodeUrl: NewId(), Hostname: NewId()}
+	cluster := ClusterInfo{IpAddress: NewId(), Hostname: NewId()}
 	clusterInfos := make([]*ClusterInfo, 1)
 	clusterInfos[0] = &cluster
 	json := ClusterInfosToJson(clusterInfos)
 	result := ClusterInfosFromJson(strings.NewReader(json))
 
-	if clusterInfos[0].Id != result[0].Id {
+	if clusterInfos[0].IpAddress != result[0].IpAddress {
 		t.Fatal("Ids do not match")
 	}
 
-- 
cgit v1.2.3-1-g7c22