From e523e8f8dea7d344889f8decbd0bbd7a776f092d Mon Sep 17 00:00:00 2001 From: Derek Collison Date: Thu, 4 Mar 2021 09:37:09 -0800 Subject: [PATCH] Fix based on feedback Signed-off-by: Derek Collison --- server/jetstream_cluster_test.go | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/server/jetstream_cluster_test.go b/server/jetstream_cluster_test.go index 37d706cd..11229ae5 100644 --- a/server/jetstream_cluster_test.go +++ b/server/jetstream_cluster_test.go @@ -2992,18 +2992,20 @@ func TestJetStreamClusterPeerOffline(t *testing.T) { checkPeer := func(ml, rs *Server, shouldBeOffline bool) { t.Helper() - var found bool - for _, s := range ml.JetStreamClusterPeers() { - if s == rs.Name() { - found = true - break - } - } - if !shouldBeOffline && !found { - t.Fatalf("Server %q not in the peers list", rs.Name()) - } - checkFor(t, 5*time.Second, 50*time.Millisecond, func() error { + var found bool + for _, s := range ml.JetStreamClusterPeers() { + if s == rs.Name() { + found = true + break + } + } + if !shouldBeOffline && !found { + return fmt.Errorf("Server %q not in the peers list", rs.Name()) + } else if shouldBeOffline && found { + return fmt.Errorf("Server %q should not be in the peers list", rs.Name()) + } + var ok bool ml.nodeToInfo.Range(func(k, v interface{}) bool { if si := v.(nodeInfo); si.name == rs.Name() {