From 2ea1afd82dff1798ac53b43b3e8b5dcaad66701f Mon Sep 17 00:00:00 2001
From: Tyler Treat <tyler.treat@apcera.com>
Date: Mon, 19 Jun 2017 14:40:57 -0500
Subject: [PATCH] Add clustering to config reload tests

---
 server/configs/reload/reload.conf |  5 +++++
 server/configs/reload/test.conf   |  5 +++++
 server/reload_test.go             | 15 +++++++++++++++
 3 files changed, 25 insertions(+)

diff --git a/server/configs/reload/reload.conf b/server/configs/reload/reload.conf
index 8da91d90..4ed06709 100644
--- a/server/configs/reload/reload.conf
+++ b/server/configs/reload/reload.conf
@@ -20,3 +20,8 @@ authorization {
     password: T0pS3cr3t
     timeout:  2
 }
+
+cluster {
+    listen:       localhost:-1
+    no_advertise: true # enable on reload
+}
diff --git a/server/configs/reload/test.conf b/server/configs/reload/test.conf
index 8bb78845..b056ff60 100644
--- a/server/configs/reload/test.conf
+++ b/server/configs/reload/test.conf
@@ -5,3 +5,8 @@ debug:   false
 trace:   false
 logtime: false
 log_file: "/tmp/gnatsd.log"
+
+cluster {
+    listen:       localhost:-1
+    no_advertise: false
+}
diff --git a/server/reload_test.go b/server/reload_test.go
index 0d298d62..42e2a27c 100644
--- a/server/reload_test.go
+++ b/server/reload_test.go
@@ -48,6 +48,10 @@ func TestConfigReloadUnsupported(t *testing.T) {
 		PingInterval:   2 * time.Minute,
 		MaxPingsOut:    2,
 		WriteDeadline:  2 * time.Second,
+		Cluster: ClusterOpts{
+			Host: "localhost",
+			Port: -1,
+		},
 	}
 	processOptions(golden)
 
@@ -109,6 +113,10 @@ func TestConfigReloadInvalidConfig(t *testing.T) {
 		PingInterval:   2 * time.Minute,
 		MaxPingsOut:    2,
 		WriteDeadline:  2 * time.Second,
+		Cluster: ClusterOpts{
+			Host: "localhost",
+			Port: -1,
+		},
 	}
 	processOptions(golden)
 
@@ -170,6 +178,10 @@ func TestConfigReload(t *testing.T) {
 		PingInterval:   2 * time.Minute,
 		MaxPingsOut:    2,
 		WriteDeadline:  2 * time.Second,
+		Cluster: ClusterOpts{
+			Host: "localhost",
+			Port: -1,
+		},
 	}
 	processOptions(golden)
 
@@ -229,6 +241,9 @@ func TestConfigReload(t *testing.T) {
 	if !server.info.AuthRequired {
 		t.Fatal("Expected AuthRequired to be true")
 	}
+	if !updated.Cluster.NoAdvertise {
+		t.Fatal("Expected NoAdvertise to be true")
+	}
 }
 
 // Ensure Reload supports TLS config changes. Test this by starting a server