Commit 50f306cf authored by acud's avatar acud Committed by GitHub

puller: fix live sync test flake (#404)

parent 602b30a4
...@@ -254,7 +254,7 @@ func TestSyncFlow_PeerWithinDepth_Live(t *testing.T) { ...@@ -254,7 +254,7 @@ func TestSyncFlow_PeerWithinDepth_Live(t *testing.T) {
kad.Trigger() kad.Trigger()
pullsync.TriggerChange() pullsync.TriggerChange()
waitCursorsCalled(t, pullsync, addr, false) waitCursorsCalled(t, pullsync, addr, false)
waitLiveSyncCalled(t, pullsync, addr, false) waitLiveSyncCalledTimes(t, pullsync, addr, len(tc.expLiveCalls))
time.Sleep(100 * time.Millisecond) time.Sleep(100 * time.Millisecond)
checkCalls(t, tc.expCalls, pullsync.SyncCalls(addr)) // hist always empty checkCalls(t, tc.expCalls, pullsync.SyncCalls(addr)) // hist always empty
...@@ -554,6 +554,19 @@ func waitSyncCalledTimes(t *testing.T, ps *mockps.PullSyncMock, addr swarm.Addre ...@@ -554,6 +554,19 @@ func waitSyncCalledTimes(t *testing.T, ps *mockps.PullSyncMock, addr swarm.Addre
t.Fatal("timed out waiting for sync") t.Fatal("timed out waiting for sync")
} }
func waitLiveSyncCalledTimes(t *testing.T, ps *mockps.PullSyncMock, addr swarm.Address, times int) {
t.Helper()
for i := 0; i < 15; i++ {
v := ps.LiveSyncCalls(addr)
if len(v) == times {
return
}
time.Sleep(50 * time.Millisecond)
}
t.Fatal("timed out waiting for sync")
}
type opts struct { type opts struct {
pullSync []mockps.Option pullSync []mockps.Option
kad []mockk.Option kad []mockk.Option
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment