Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/ten-ways-flash.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"chainlink": patch
---

#internal fix test flake on integration test with evm relayer and wf reg v2 syncer
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,6 @@ func Test_RegistrySyncer_SkipsEventsNotBelongingToDONV2(t *testing.T) {
lggr = logger.TestLogger(t)
backendTH = testutils.NewEVMBackendTH(t)

tickChan = make(chan time.Time)
giveBinaryURL = "https://original-url.com"
donID = uint32(1)
donFamily1 = "A"
Expand Down Expand Up @@ -178,7 +177,6 @@ func Test_RegistrySyncer_SkipsEventsNotBelongingToDONV2(t *testing.T) {
err: nil,
},
syncer.NewEngineRegistry(),
syncer.WithTicker(tickChan),
)
require.NoError(t, err)

Expand All @@ -188,16 +186,10 @@ func Test_RegistrySyncer_SkipsEventsNotBelongingToDONV2(t *testing.T) {

servicetest.Run(t, worker)

// Trigger a sync
tickChan <- time.Now()

// generate a log event
upsertWorkflowV2(t, backendTH, wfRegistryC, skippedWorkflow)
upsertWorkflowV2(t, backendTH, wfRegistryC, giveWorkflow)

// Trigger a sync
tickChan <- time.Now()

require.Eventually(t, func() bool {
// we process events in order, and should only receive 1 event
// the first is skipped as it belongs to another don.
Expand All @@ -214,7 +206,6 @@ func Test_RegistrySyncer_WorkflowRegistered_InitiallyPausedV2(t *testing.T) {
db = pgtest.NewSqlxDB(t)
orm = artifacts.NewWorkflowRegistryDS(db, lggr)

tickChan = make(chan time.Time)
giveBinaryURL = "https://original-url.com"
donID = uint32(1)
donFamily = "A"
Expand Down Expand Up @@ -284,7 +275,6 @@ func Test_RegistrySyncer_WorkflowRegistered_InitiallyPausedV2(t *testing.T) {
err: nil,
},
er,
syncer.WithTicker(tickChan),
)
require.NoError(t, err)

Expand All @@ -297,9 +287,6 @@ func Test_RegistrySyncer_WorkflowRegistered_InitiallyPausedV2(t *testing.T) {
// generate a log event
upsertWorkflowV2(t, backendTH, wfRegistryC, giveWorkflow)

// Trigger a sync
tickChan <- time.Now()

// Paused workflows should generate no events
time.Sleep(5 * time.Second)
_, ok := er.Get(wfTypes.WorkflowID(id))
Expand All @@ -317,7 +304,6 @@ func Test_RegistrySyncer_WorkflowRegistered_InitiallyActivatedV2(t *testing.T) {
db = pgtest.NewSqlxDB(t)
orm = artifacts.NewWorkflowRegistryDS(db, lggr)

tickChan = make(chan time.Time)
giveBinaryURL = "https://original-url.com"
donID = uint32(1)
donFamily = "A"
Expand Down Expand Up @@ -387,7 +373,6 @@ func Test_RegistrySyncer_WorkflowRegistered_InitiallyActivatedV2(t *testing.T) {
err: nil,
},
er,
syncer.WithTicker(tickChan),
)
require.NoError(t, err)

Expand All @@ -400,9 +385,6 @@ func Test_RegistrySyncer_WorkflowRegistered_InitiallyActivatedV2(t *testing.T) {
// generate a log event
upsertWorkflowV2(t, backendTH, wfRegistryC, giveWorkflow)

// Trigger a sync
tickChan <- time.Now()

// Require the secrets contents to eventually be updated
require.Eventually(t, func() bool {
_, ok := er.Get(wfTypes.WorkflowID(id))
Expand Down
Loading