Get rid of some flakes, add some logging

itests/multisig_test.go

@@ -18,6 +18,7 @@ import (
 	"github.com/filecoin-project/go-state-types/exitcode"
 
 	"github.com/filecoin-project/lotus/blockstore"
+	"github.com/filecoin-project/lotus/build"
 	"github.com/filecoin-project/lotus/chain/actors"
 	"github.com/filecoin-project/lotus/chain/actors/adt"
 	lmultisig "github.com/filecoin-project/lotus/chain/actors/builtin/multisig"
@@ -118,6 +119,8 @@ func TestMultisigReentrant(t *testing.T) {
 	pp, err := client.MsigPropose(ctx, multisigAddress, multisigAddress, big.Zero(), signer, uint64(builtin.MethodsMultisig.Approve), approveParams)
 	require.NoError(t, err)
 
+	pp.Message.GasLimit = build.BlockGasLimit
+
 	pm, err := client.MpoolPushMessage(ctx, &pp.Message, nil)
 	require.NoError(t, err, "failed to send reentrant propose message (MpooPushMessage)")
 
@@ -133,7 +136,7 @@ func TestMultisigReentrant(t *testing.T) {
 	sl, err := client.StateReplay(ctx, types.EmptyTSK, pm.Cid())
 	require.NoError(t, err, "failed to replay reentrant propose message (StateWaitMsg)")
 
-	require.Equal(t, 1025, countDepth(sl.ExecutionTrace))
+	require.Equal(t, 1025, countDepth(sl.ExecutionTrace), "Failed. Error message was: %s", sl.Error)
 }
 
 func countDepth(trace types.ExecutionTrace) int {