From 5b9d92d39f9882bcd1823b25776828eb7f2d9cc6 Mon Sep 17 00:00:00 2001
From: Balamurali Gopalswami <167726375+b-gopalswami@users.noreply.github.com>
Date: Wed, 21 Aug 2024 16:40:22 -0400
Subject: [PATCH] Fix flakey ccipreader_test as per CCIP pr 1337 (#14189)

---
 .../ccipreader/ccipreader_test.go                     | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/core/capabilities/ccip/ccip_integration_tests/ccipreader/ccipreader_test.go b/core/capabilities/ccip/ccip_integration_tests/ccipreader/ccipreader_test.go
index 66c47f4741f..e0de0b801d9 100644
--- a/core/capabilities/ccip/ccip_integration_tests/ccipreader/ccipreader_test.go
+++ b/core/capabilities/ccip/ccip_integration_tests/ccipreader/ccipreader_test.go
@@ -3,6 +3,7 @@ package ccipreader
 import (
 	"context"
 	"math/big"
+	"sort"
 	"testing"
 	"time"
 
@@ -110,7 +111,7 @@ func TestCCIPReader_CommitReportsGTETimestamp(t *testing.T) {
 		)
 		require.NoError(t, err)
 		return len(reports) == numReports-1
-	}, testutils.WaitTimeout(t), 50*time.Millisecond)
+	}, 10*time.Second, 50*time.Millisecond)
 
 	assert.Len(t, reports[0].Report.MerkleRoots, 1)
 	assert.Equal(t, chainS1, reports[0].Report.MerkleRoots[0].ChainSel)
@@ -250,6 +251,10 @@ func TestCCIPReader_MsgsBetweenSeqNums(t *testing.T) {
 
 	s.sb.Commit()
 
+	// Need to replay as sometimes the logs are not picked up by the log poller (?)
+	// Maybe another situation where chain reader doesn't register filters as expected.
+	require.NoError(t, s.lp.Replay(ctx, 1))
+
 	var msgs []cciptypes.Message
 	require.Eventually(t, func() bool {
 		msgs, err = s.reader.MsgsBetweenSeqNums(
@@ -262,6 +267,10 @@ func TestCCIPReader_MsgsBetweenSeqNums(t *testing.T) {
 	}, 10*time.Second, 100*time.Millisecond)
 
 	require.Len(t, msgs, 2)
+	// sort to ensure ascending order of sequence numbers.
+	sort.Slice(msgs, func(i, j int) bool {
+		return msgs[i].Header.SequenceNumber < msgs[j].Header.SequenceNumber
+	})
 	require.Equal(t, cciptypes.SeqNum(10), msgs[0].Header.SequenceNumber)
 	require.Equal(t, cciptypes.SeqNum(15), msgs[1].Header.SequenceNumber)
 	for _, msg := range msgs {