diff --git a/core/services/fluxmonitorv2/integrations_test.go b/core/services/fluxmonitorv2/integrations_test.go index fcd91eac537..1ff1897b78e 100644 --- a/core/services/fluxmonitorv2/integrations_test.go +++ b/core/services/fluxmonitorv2/integrations_test.go @@ -735,7 +735,6 @@ ds1 -> ds1_parse } func TestFluxMonitor_HibernationMode(t *testing.T) { - g := gomega.NewWithT(t) fa := setupFluxAggregatorUniverse(t) // - add oracles @@ -838,12 +837,14 @@ ds1 -> ds1_parse fa.backend.Commit() // wait for FM to receive flags raised logs - g.Eventually(func() int { + require.Eventually(t, func() bool { ilogs, err := fa.flagsContract.FilterFlagRaised(nil, []common.Address{}) - require.NoError(t, err) + if err != nil { + return false + } logs := cltest.GetLogs(t, nil, ilogs) - return len(logs) - }, testutils.WaitTimeout(t), 100*time.Millisecond).Should(gomega.Equal(4)) + return len(logs) == 4 + }, testutils.WaitTimeout(t), 100*time.Millisecond, "expected 4 FlagRaised logs from flags contract") // change in price should not trigger run reportPrice.Store(8) diff --git a/core/services/vrf/v2/integration_v2_test.go b/core/services/vrf/v2/integration_v2_test.go index 06dbf2a1c1e..ba09ae1b42f 100644 --- a/core/services/vrf/v2/integration_v2_test.go +++ b/core/services/vrf/v2/integration_v2_test.go @@ -718,13 +718,22 @@ func requestRandomnessAndAssertRandomWordsRequestedEvent( require.NoError(t, err) backend.Commit() - iter, err := coordinator.FilterRandomWordsRequested(nil, nil, []*big.Int{subID}, nil) - require.NoError(t, err, "could not filter RandomWordsRequested events") - var events []v22.RandomWordsRequested - for iter.Next() { - events = append(events, iter.Event()) - } + require.Eventually(t, func() bool { + iter, err := coordinator.FilterRandomWordsRequested(nil, nil, []*big.Int{subID}, nil) + if err != nil { + return false + } + var batch []v22.RandomWordsRequested + for iter.Next() { + batch = append(batch, iter.Event()) + } + if len(batch) == 0 { + return false + } + events = batch + return true + }, testutils.WaitTimeout(t), 100*time.Millisecond, "could not filter RandomWordsRequested events (simulated backend may need retries)") requestID, err = vrfConsumerHandle.SRequestId(nil) require.NoError(t, err)