Merge pull request #8092 from yyforyongyu/fix-peer-unit-test

multi: fix peer unit test and disable `paralleltest`
This commit is contained in:
Oliver Gugger authored and GitHub committed 2023-10-17 10:18:27 +00:00
commit b0bb853f77
7 files changed
+38 -37

No files matched your search

+9 -10
View File
@@ -371,7 +371,7 @@ func TestSimpleAddSettleWorkflow(t *testing.T) {
})
}
t.Run("anchors", func(t *testing.T) { //nolint:paralleltest
t.Run("anchors", func(t *testing.T) {
testAddSettleWorkflow(
t, true,
channeldb.AnchorOutputsBit|channeldb.ZeroHtlcTxFeeBit,
@@ -379,13 +379,12 @@ func TestSimpleAddSettleWorkflow(t *testing.T) {
)
})
t.Run("taproot", func(t *testing.T) { //nolint:paralleltest
t.Run("taproot", func(t *testing.T) {
testAddSettleWorkflow(
t, true, channeldb.SimpleTaprootFeatureBit, false,
)
})
//nolint:paralleltest
t.Run("storeFinalHtlcResolutions=true", func(t *testing.T) {
testAddSettleWorkflow(t, false, 0, true)
})
@@ -819,7 +818,7 @@ func TestForceClose(t *testing.T) {
anchorAmt: anchorSize * 2,
})
})
t.Run("taproot", func(t *testing.T) { //nolint:paralleltest
t.Run("taproot", func(t *testing.T) {
testForceClose(t, &forceCloseTestCase{
chanType: channeldb.SingleFunderTweaklessBit |
channeldb.AnchorOutputsBit |
@@ -3594,10 +3593,10 @@ func testChanSyncOweRevocation(t *testing.T, chanType channeldb.ChannelType) {
func TestChanSyncOweRevocation(t *testing.T) {
t.Parallel()
t.Run("tweakless", func(t *testing.T) { //nolint:paralleltest
t.Run("tweakless", func(t *testing.T) {
testChanSyncOweRevocation(t, channeldb.SingleFunderTweaklessBit)
})
t.Run("taproot", func(t *testing.T) { //nolint:paralleltest
t.Run("taproot", func(t *testing.T) {
taprootBits := channeldb.SimpleTaprootFeatureBit |
channeldb.AnchorOutputsBit |
channeldb.ZeroHtlcTxFeeBit |
@@ -3777,12 +3776,12 @@ func testChanSyncOweRevocationAndCommit(t *testing.T,
func TestChanSyncOweRevocationAndCommit(t *testing.T) {
t.Parallel()
t.Run("tweakless", func(t *testing.T) { //nolint:paralleltest
t.Run("tweakless", func(t *testing.T) {
testChanSyncOweRevocationAndCommit(
t, channeldb.SingleFunderTweaklessBit,
)
})
t.Run("taproot", func(t *testing.T) { //nolint:paralleltest
t.Run("taproot", func(t *testing.T) {
taprootBits := channeldb.SimpleTaprootFeatureBit |
channeldb.AnchorOutputsBit |
channeldb.ZeroHtlcTxFeeBit |
@@ -4006,12 +4005,12 @@ func testChanSyncOweRevocationAndCommitForceTransition(t *testing.T,
func TestChanSyncOweRevocationAndCommitForceTransition(t *testing.T) {
t.Parallel()
t.Run("tweakless", func(t *testing.T) { //nolint:paralleltest
t.Run("tweakless", func(t *testing.T) {
testChanSyncOweRevocationAndCommitForceTransition(
t, channeldb.SingleFunderTweaklessBit,
)
})
t.Run("taproot", func(t *testing.T) { //nolint:paralleltest
t.Run("taproot", func(t *testing.T) {
taprootBits := channeldb.SimpleTaprootFeatureBit |
channeldb.AnchorOutputsBit |
channeldb.ZeroHtlcTxFeeBit |
+2 -2
View File
@@ -228,7 +228,7 @@ func TestMusigSesssion(t *testing.T) {
// commitment, and one for the remote commitment.
muSessions := newMuSessionHarness(t)
t.Run("session_round_trips", func(t *testing.T) { //nolint:paralleltest
t.Run("session_round_trips", func(t *testing.T) {
const numRounds = 10
for i := 0; i < numRounds; i++ {
// We'll now simulate a full commitment dance.
@@ -262,7 +262,7 @@ func TestMusigSesssion(t *testing.T) {
}
})
t.Run("no_finalize_error", func(t *testing.T) { //nolint:paralleltest
t.Run("no_finalize_error", func(t *testing.T) {
// If a local party attempts to sign for their local commitment
// without finalizing first, they'll get this error.
_, err := muSessions.aliceSession.LocalSession.SignCommit(
+2 -2
View File
@@ -131,7 +131,7 @@ func TestWalletRebroadcaster(t *testing.T) {
ChainIO: chainIO,
}
t.Run("rebroadcast bypass", func(t *testing.T) { //nolint:paralleltest
t.Run("rebroadcast bypass", func(t *testing.T) {
// We'll make a copy of the config, but without the
// broadcaster.
testCfg := *cfg
@@ -166,7 +166,7 @@ func TestWalletRebroadcaster(t *testing.T) {
require.NoError(t, err)
})
t.Run("rebroadcast normal", func(t *testing.T) { //nolint:paralleltest
t.Run("rebroadcast normal", func(t *testing.T) {
wallet, err := NewLightningWallet(*cfg)
require.NoError(t, err)
require.NoError(t, wallet.Startup())