cerc-io/lotus
16
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

Merge pull request #10826 from filecoin-project/asr/deflake-msgindex

Browse Source 
feat: deflake msgindex_test.go
This commit is contained in:
Aayush Rajasekaran 2023-05-04 13:39:46 -04:00 committed by GitHub
commit 45f3e694a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
chain/index/msgindex_test.go
View File

@ -39,10 +39,10 @@ func TestBasicMsgIndex(t *testing.T) {
t.Logf("advance to epoch %d", i+1) t.Logf("advance to epoch %d", i+1)
err := cs.advance() err := cs.advance()
require.NoError(t, err) require.NoError(t, err)
// wait for the coalescer to notify
time.Sleep(CoalesceMinDelay + 10*time.Millisecond)
} }
waitForCoalescerAfterLastEvent()
t.Log("verifying index") t.Log("verifying index")
verifyIndex(t, cs, msgIndex) verifyIndex(t, cs, msgIndex)
} }
@ -51,7 +51,7 @@ func TestReorgMsgIndex(t *testing.T) {
// slightly more nuanced test that includes reorgs // slightly more nuanced test that includes reorgs
// 1. Create an index with mock chain store // 1. Create an index with mock chain store
// 2. Advance/Reorg the chain for a few tipsets // 2. Advance/Reorg the chain for a few tipsets
// 3. Verify that the index contains all messages with the correct tipst/epoch // 3. Verify that the index contains all messages with the correct tipset/epoch
cs := newMockChainStore() cs := newMockChainStore()
cs.genesis() cs.genesis()
@ -67,10 +67,10 @@ func TestReorgMsgIndex(t *testing.T) {
t.Logf("advance to epoch %d", i+1) t.Logf("advance to epoch %d", i+1)
err := cs.advance() err := cs.advance()
require.NoError(t, err) require.NoError(t, err)
// wait for the coalescer to notify
time.Sleep(CoalesceMinDelay + 10*time.Millisecond)
} }
waitForCoalescerAfterLastEvent()
// a simple reorg // a simple reorg
t.Log("doing reorg") t.Log("doing reorg")
reorgme := cs.curTs reorgme := cs.curTs
@ -80,7 +80,8 @@ func TestReorgMsgIndex(t *testing.T) {
reorgmeChild := cs.makeBlk() reorgmeChild := cs.makeBlk()
err = cs.reorg([]*types.TipSet{reorgme}, []*types.TipSet{reorgmeChild}) err = cs.reorg([]*types.TipSet{reorgme}, []*types.TipSet{reorgmeChild})
require.NoError(t, err) require.NoError(t, err)
time.Sleep(CoalesceMinDelay + 10*time.Millisecond)
waitForCoalescerAfterLastEvent()
t.Log("verifying index") t.Log("verifying index")
verifyIndex(t, cs, msgIndex) verifyIndex(t, cs, msgIndex)
@ -109,10 +110,10 @@ func TestReconcileMsgIndex(t *testing.T) {
t.Logf("advance to epoch %d", i+1) t.Logf("advance to epoch %d", i+1)
err := cs.advance() err := cs.advance()
require.NoError(t, err) require.NoError(t, err)
// wait for the coalescer to notify
time.Sleep(CoalesceMinDelay + 10*time.Millisecond)
} }
waitForCoalescerAfterLastEvent()
// Close it and reorg // Close it and reorg
err = msgIndex.Close() err = msgIndex.Close()
require.NoError(t, err) require.NoError(t, err)
@ -296,3 +297,11 @@ func (cs *mockChainStore) GetTipSetFromKey(ctx context.Context, tsk types.TipSet
} }
return ts, nil return ts, nil
} }
func waitForCoalescerAfterLastEvent() {
// It can take up to CoalesceMinDelay for the coalescer timer to fire after the last event.
// When the timer fires, it can wait up to CoalesceMinDelay again for more events.
// Therefore the total wait is 2 * CoalesceMinDelay.
// Then we wait another second for the listener (the index) to actually process events.
time.Sleep(2*CoalesceMinDelay + time.Second)
}