Merge pull request #1494 from lightninglabs/itest-postgres-flake

fix itest flake: allow AssertNonInteractiveRecvComplete more time to execute

Author: ffranr

itest/assertions.go

@@ -1240,13 +1240,13 @@ func AssertAssetOutboundTransferWithOutputs(t *testing.T,
 func AssertNonInteractiveRecvComplete(t *testing.T,
 	receiver taprpc.TaprootAssetsClient, totalInboundTransfers int) {
 
-	ctxb := context.Background()
-	ctxt, cancel := context.WithTimeout(ctxb, defaultWaitTimeout)
-	defer cancel()
-
 	// And finally, they should be marked as completed with a proof
 	// available.
 	err := wait.NoError(func() error {
+		ctxb := context.Background()
+		ctxt, cancel := context.WithTimeout(ctxb, defaultWaitTimeout/2)
+		defer cancel()
+
 		resp, err := receiver.AddrReceives(
 			ctxt, &taprpc.AddrReceivesRequest{},
 		)
@@ -1265,7 +1265,7 @@ func AssertNonInteractiveRecvComplete(t *testing.T,
 		}
 
 		return nil
-	}, defaultWaitTimeout/2)
+	}, defaultWaitTimeout)
 	require.NoError(t, err)
 }
 

itest/send_test.go

@@ -760,8 +760,7 @@ func testReattemptFailedSendHashmailCourier(t *harnessTest) {
 	expectedEventCount := nodeBackoffCfg.NumTries - 1
 
 	// Context timeout scales with expected number of events.
-	timeout := time.Duration(expectedEventCount) *
-		defaultProofTransferReceiverAckTimeout
+	timeout := time.Duration(expectedEventCount) * nodeBackoffCfg.MaxBackoff
 
 	// Allow for some margin for the operations that aren't pure
 	// waiting on the receiver ACK.
@@ -868,8 +867,7 @@ func testReattemptProofTransferOnTapdRestart(t *harnessTest) {
 	expectedEventCount := nodeBackoffCfg.NumTries - 1
 
 	// Context timeout scales with expected number of events.
-	timeout := time.Duration(expectedEventCount) *
-		defaultProofTransferReceiverAckTimeout
+	timeout := time.Duration(expectedEventCount) * nodeBackoffCfg.MaxBackoff
 
 	// Allow for some margin for the operations that aren't pure waiting on
 	// the receiver ACK.
@@ -1029,8 +1027,7 @@ func testReattemptFailedSendUniCourier(t *harnessTest) {
 	expectedEventCount := nodeBackoffCfg.NumTries - 1
 
 	// Context timeout scales with expected number of events.
-	timeout := time.Duration(expectedEventCount) *
-		defaultProofTransferReceiverAckTimeout
+	timeout := time.Duration(expectedEventCount) * nodeBackoffCfg.MaxBackoff
 
 	// Allow for some margin for the operations that aren't pure waiting on
 	// the receiver ACK.

itest/tapd_harness.go

@@ -57,19 +57,19 @@ var (
 	// for sending proofs with the hashmail courier.
 	defaultHashmailBackoffConfig = proof.BackoffCfg{
 		BackoffResetWait: time.Second,
-		NumTries:         5,
+		NumTries:         10,
 		InitialBackoff:   300 * time.Millisecond,
-		MaxBackoff:       600 * time.Millisecond,
+		MaxBackoff:       2 * time.Second,
 	}
 
 	// defaultUniverseRpcBackoffConfig is the default backoff config we'll
 	// use for sending proofs with the universe RPC courier.
 	defaultUniverseRpcBackoffConfig = proof.BackoffCfg{
 		SkipInitDelay:    true,
 		BackoffResetWait: time.Second,
-		NumTries:         5,
+		NumTries:         10,
 		InitialBackoff:   300 * time.Millisecond,
-		MaxBackoff:       600 * time.Millisecond,
+		MaxBackoff:       2 * time.Second,
 	}
 
 	// defaultProofRetrievalDelay is the default delay we'll use for the