From 55f8982e33a258f2f2ef2854f4bc148685bfbc5d Mon Sep 17 00:00:00 2001 From: Derek Collison Date: Sat, 16 Apr 2022 05:08:12 -0700 Subject: [PATCH] Fix flapping test Signed-off-by: Derek Collison --- server/jetstream_cluster_test.go | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/server/jetstream_cluster_test.go b/server/jetstream_cluster_test.go index 13fecfdd..e3b7249e 100644 --- a/server/jetstream_cluster_test.go +++ b/server/jetstream_cluster_test.go @@ -12568,7 +12568,8 @@ func TestJetStreamClusterDeleteAndRestoreAndRestart(t *testing.T) { _, err := js.Publish("TEST", []byte("OK")) require_NoError(t, err) } - sub, err := js.SubscribeSync("TEST", nats.Durable("dlc")) + + sub, err := js.SubscribeSync("TEST", nats.Durable("dlc"), nats.Description("SECOND")) require_NoError(t, err) for i := 0; i < 5; i++ { @@ -12582,6 +12583,7 @@ func TestJetStreamClusterDeleteAndRestoreAndRestart(t *testing.T) { sl.Shutdown() sl = c.restartServer(sl) c.waitOnStreamLeader("$G", "TEST") + c.waitOnConsumerLeader("$G", "TEST", "dlc") nc, js = jsClientConnect(t, c.randomServer()) defer nc.Close() @@ -12612,9 +12614,13 @@ func TestJetStreamClusterDeleteAndRestoreAndRestart(t *testing.T) { c.restartServer(sl) c.waitOnStreamLeader("$G", "TEST") - _, err = js.ConsumerInfo("TEST", "dlc") - require_Error(t, err) - + // In rare circumstances this could be recovered and then quickly deleted. + checkFor(t, 2*time.Second, 100*time.Millisecond, func() error { + if _, err := js.ConsumerInfo("TEST", "dlc"); err == nil { + return fmt.Errorf("Not cleaned up yet") + } + return nil + }) } // Support functions