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

Merge pull request #4609 from filecoin-project/fix/flaky-testMiningReal

Browse Source 
Fix flaky testMiningReal
This commit is contained in:
Łukasz Magiera 2020-10-27 14:27:52 +01:00 committed by GitHub
commit 3d02dba5dc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
api/test/mining.go
View File

@ -58,14 +58,11 @@ func (ts *testSuite) testMiningReal(t *testing.T) {
newHeads, err := api.ChainNotify(ctx) newHeads, err := api.ChainNotify(ctx)
require.NoError(t, err) require.NoError(t, err)
initHead := (<-newHeads)[0] at := (<-newHeads)[0].Val.Height()
if initHead.Val.Height() != 2 {
<-newHeads
}
h1, err := api.ChainHead(ctx) h1, err := api.ChainHead(ctx)
require.NoError(t, err) require.NoError(t, err)
require.Equal(t, abi.ChainEpoch(2), h1.Height()) require.Equal(t, int64(at), int64(h1.Height()))
MineUntilBlock(ctx, t, apis[0], sn[0], nil) MineUntilBlock(ctx, t, apis[0], sn[0], nil)
require.NoError(t, err) require.NoError(t, err)
@ -74,16 +71,16 @@ func (ts *testSuite) testMiningReal(t *testing.T) {
h2, err := api.ChainHead(ctx) h2, err := api.ChainHead(ctx)
require.NoError(t, err) require.NoError(t, err)
require.Equal(t, abi.ChainEpoch(3), h2.Height()) require.Greater(t, int64(h2.Height()), int64(h1.Height()))
MineUntilBlock(ctx, t, apis[0], sn[0], nil) MineUntilBlock(ctx, t, apis[0], sn[0], nil)
require.NoError(t, err) require.NoError(t, err)
<-newHeads <-newHeads
h2, err = api.ChainHead(ctx) h3, err := api.ChainHead(ctx)
require.NoError(t, err) require.NoError(t, err)
require.Equal(t, abi.ChainEpoch(4), h2.Height()) require.Greater(t, int64(h3.Height()), int64(h2.Height()))
} }
func TestDealMining(t *testing.T, b APIBuilder, blocktime time.Duration, carExport bool) { func TestDealMining(t *testing.T, b APIBuilder, blocktime time.Duration, carExport bool) {