test: Fix flakes

Author: alarso16

plugin/evm/atomic/vm/gossiper_atomic_gossiping_test.go

@@ -121,9 +121,10 @@ func TestMempoolAtmTxsAppGossipHandlingDiscardedTx(t *testing.T) {
 	}()
 
 	var (
-		txGossiped     int
-		txGossipedLock sync.Mutex
-		txRequested    bool
+		txGossiped      int
+		txGossipedLock  sync.Mutex
+		txRequested     bool
+		txRequestedLock sync.Mutex
 	)
 	tvm.AppSender.CantSendAppGossip = false
 	tvm.AppSender.SendAppGossipF = func(context.Context, commonEng.SendConfig, []byte) error {
@@ -134,6 +135,9 @@ func TestMempoolAtmTxsAppGossipHandlingDiscardedTx(t *testing.T) {
 		return nil
 	}
 	tvm.AppSender.SendAppRequestF = func(context.Context, set.Set[ids.NodeID], uint32, []byte) error {
+		txRequestedLock.Lock()
+		defer txRequestedLock.Unlock()
+
 		txRequested = true
 		return nil
 	}
@@ -177,13 +181,16 @@ func TestMempoolAtmTxsAppGossipHandlingDiscardedTx(t *testing.T) {
 	// Conflicting tx must be submitted over the API to be included in push gossip.
 	// (i.e., txs received via p2p are not included in push gossip)
 	// This test adds it directly to the mempool + gossiper to simulate that.
-	vm.AtomicMempool.AddRemoteTx(conflictingTx)
+	require.NoError(vm.AtomicMempool.AddRemoteTx(conflictingTx))
 	vm.AtomicTxPushGossiper.Add(conflictingTx)
-	time.Sleep(500 * time.Millisecond)
+	vm.AtomicTxPushGossiper.Gossip(context.Background()) // We don't want to wait to gossip.
 
 	vm.Ctx.Lock.Lock()
 
+	txRequestedLock.Lock()
 	require.False(txRequested, "tx shouldn't be requested")
+	txRequestedLock.Unlock()
+
 	txGossipedLock.Lock()
 	require.Equal(1, txGossiped, "conflicting tx should have been gossiped")
 	txGossipedLock.Unlock()

plugin/evm/gossiper_eth_gossiping_test.go

@@ -93,17 +93,21 @@ func TestMempoolEthTxsAppGossipHandling(t *testing.T) {
 	vm.txPool.SetMinFee(common.Big0)
 
 	var (
-		wg          sync.WaitGroup
 		txRequested bool
+		txResponded bool
+		statusLock  sync.Mutex
 	)
 	tvm.AppSender.CantSendAppGossip = false
 	tvm.AppSender.SendAppRequestF = func(context.Context, set.Set[ids.NodeID], uint32, []byte) error {
+		statusLock.Lock()
+		defer statusLock.Unlock()
 		txRequested = true
 		return nil
 	}
-	wg.Add(1)
 	tvm.AppSender.SendAppGossipF = func(context.Context, commonEng.SendConfig, []byte) error {
-		wg.Done()
+		statusLock.Lock()
+		defer statusLock.Unlock()
+		txResponded = true
 		return nil
 	}
 
@@ -113,26 +117,9 @@ func TestMempoolEthTxsAppGossipHandling(t *testing.T) {
 	// Txs must be submitted over the API to be included in push gossip.
 	// (i.e., txs received via p2p are not included in push gossip)
 	require.NoError(vm.eth.APIBackend.SendTx(context.Background(), tx))
+	require.NoError(vm.ethTxPushGossiper.Get().Gossip(context.Background()))
+	statusLock.Lock()
 	require.False(txRequested, "tx should not be requested")
-
-	// wait for transaction to be re-gossiped
-	attemptAwait(t, &wg, 5*time.Second)
-}
-
-func attemptAwait(t *testing.T, wg *sync.WaitGroup, delay time.Duration) {
-	ticker := make(chan struct{})
-
-	// Wait for [wg] and then close [ticket] to indicate that
-	// the wait group has finished.
-	go func() {
-		wg.Wait()
-		close(ticker)
-	}()
-
-	select {
-	case <-time.After(delay):
-		require.FailNow(t, "Timed out waiting for wait group to complete")
-	case <-ticker:
-		// The wait group completed without issue
-	}
+	require.True(txResponded, "expected tx to be gossiped")
+	statusLock.Unlock()
 }

scripts/known_flakes.txt

@@ -1,11 +1,8 @@
 TestClientCancelWebsocket
 TestClientWebsocketLargeMessage
 TestGolangBindings
-TestMempoolAtmTxsAppGossipHandlingDiscardedTx
-TestMempoolEthTxsAppGossipHandling
 TestResumeSyncAccountsTrieInterrupted
 TestResyncNewRootAfterDeletes
 TestTransactionSkipIndexing
-TestUpdatedKeyfileContents
 TestWaitDeployedCornerCases
 TestWebsocketLargeRead