From eb89b8736a52fe86c0e5ed166cbd64cef0d3d09b Mon Sep 17 00:00:00 2001 From: Maurice van Veen Date: Mon, 6 Jan 2025 23:01:59 +0100 Subject: [PATCH] De-flake StreamResetOnExpirationDuringPeerDownAndRestartWithLeaderChange Signed-off-by: Maurice van Veen --- server/jetstream_cluster_2_test.go | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/server/jetstream_cluster_2_test.go b/server/jetstream_cluster_2_test.go index 9164175a589..07a08268422 100644 --- a/server/jetstream_cluster_2_test.go +++ b/server/jetstream_cluster_2_test.go @@ -6319,8 +6319,12 @@ func TestJetStreamClusterStreamResetOnExpirationDuringPeerDownAndRestartWithLead // Wait for all messages to expire. checkFor(t, 5*time.Second, time.Second, func() error { - si, err := js.StreamInfo("TEST") - require_NoError(t, err) + ctx, cancel := context.WithTimeout(context.Background(), time.Second) + defer cancel() + si, err := js.StreamInfo("TEST", nats.Context(ctx)) + if err != nil { + return err + } if si.State.Msgs == 0 { return nil } @@ -6358,9 +6362,11 @@ func TestJetStreamClusterStreamResetOnExpirationDuringPeerDownAndRestartWithLead } // Now move the leader there and double check, but above test is sufficient. - checkFor(t, 10*time.Second, 250*time.Millisecond, func() error { + checkFor(t, 30*time.Second, 250*time.Millisecond, func() error { _, err = nc.Request(fmt.Sprintf(JSApiStreamLeaderStepDownT, "TEST"), nil, time.Second) - require_NoError(t, err) + if err != nil { + return err + } c.waitOnStreamLeader("$G", "TEST") if c.streamLeader("$G", "TEST") == nsl { return nil