From 28d4420a2c1844fd8e0e62144c15061949029454 Mon Sep 17 00:00:00 2001 From: Ivan Kozlovic Date: Tue, 11 Jul 2017 09:06:00 -0600 Subject: [PATCH] Fixed some config reload cluster tests Use checkClusterFormed() to minimize risk of test failures due to the subscription not being registered through the cluster. --- server/reload_test.go | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/server/reload_test.go b/server/reload_test.go index 730031e5..aa3a7b94 100644 --- a/server/reload_test.go +++ b/server/reload_test.go @@ -1158,6 +1158,8 @@ func TestConfigReloadEnableClusterAuthorization(t *testing.T) { defer os.Remove(srvaConfig) defer srva.Shutdown() + checkClusterFormed(t, srva, srvb) + srvaAddr := fmt.Sprintf("nats://%s:%d", srvaOpts.Host, srvaOpts.Port) srvaConn, err := nats.Connect(srvaAddr) if err != nil { @@ -1234,7 +1236,7 @@ func TestConfigReloadEnableClusterAuthorization(t *testing.T) { if err := srva.Reload(); err != nil { t.Fatalf("Error reloading config: %v", err) } - time.Sleep(10 * time.Millisecond) + checkClusterFormed(t, srva, srvb) if numRoutes := srvb.NumRoutes(); numRoutes != 1 { t.Fatalf("Expected 1 route, got %d", numRoutes) @@ -1267,6 +1269,8 @@ func TestConfigReloadDisableClusterAuthorization(t *testing.T) { defer os.Remove(srvaConfig) defer srva.Shutdown() + checkClusterFormed(t, srva, srvb) + srvaAddr := fmt.Sprintf("nats://%s:%d", srvaOpts.Host, srvaOpts.Port) srvaConn, err := nats.Connect(srvaAddr) if err != nil { @@ -1318,6 +1322,8 @@ func TestConfigReloadDisableClusterAuthorization(t *testing.T) { t.Fatalf("Error reloading config: %v", err) } + checkClusterFormed(t, srva, srvb) + if numRoutes := srvb.NumRoutes(); numRoutes != 1 { t.Fatalf("Expected 1 route, got %d", numRoutes) } @@ -1349,6 +1355,8 @@ func TestConfigReloadClusterRoutes(t *testing.T) { defer os.Remove(srvaConfig) defer srva.Shutdown() + checkClusterFormed(t, srva, srvb) + srvcOpts, err := ProcessConfigFile("./configs/reload/srv_c_1.conf") if err != nil { t.Fatalf("Error processing config file: %v", err) @@ -1412,7 +1420,7 @@ func TestConfigReloadClusterRoutes(t *testing.T) { if err := srva.Reload(); err != nil { t.Fatalf("Error reloading config: %v", err) } - time.Sleep(20 * time.Millisecond) + checkClusterFormed(t, srva, srvc) srvcAddr := fmt.Sprintf("nats://%s:%d", srvcOpts.Host, srvcOpts.Port) srvcConn, err := nats.Connect(srvcAddr)