Skip to content

Commit 1d39d70

Browse files
algorandskiycce
andauthored
tests: network flaky tests fixes (#6407)
Co-authored-by: cce <51567+cce@users.noreply.github.com>
1 parent e11f501 commit 1d39d70

File tree

3 files changed

+10
-2
lines changed

3 files changed

+10
-2
lines changed

network/p2pNetwork_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1250,7 +1250,7 @@ func TestP2PwsStreamHandlerDedup(t *testing.T) {
12501250
defer netB.Stop()
12511251

12521252
require.Eventually(t, func() bool {
1253-
return networkPeerIdentityDisconnect.GetUint64Value() == networkPeerIdentityDisconnectInitial+1
1253+
return networkPeerIdentityDisconnect.GetUint64Value() > networkPeerIdentityDisconnectInitial
12541254
}, 2*time.Second, 50*time.Millisecond)
12551255

12561256
// now allow the peer made outgoing connection to handle conn closing initiated by the other side

network/wsNetwork_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ func setupWebsocketNetworkABwithLogger(t *testing.T, countTarget int, log loggin
337337
counter := newMessageCounter(t, countTarget)
338338
netB.RegisterHandlers([]TaggedMessageHandler{{Tag: protocol.TxnTag, MessageHandler: counter}})
339339

340-
readyTimeout := time.NewTimer(2 * time.Second)
340+
readyTimeout := time.NewTimer(5 * time.Second)
341341
waitReady(t, netA, readyTimeout.C)
342342
t.Log("a ready")
343343
waitReady(t, netB, readyTimeout.C)

node/node_test.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -952,10 +952,18 @@ func TestNodeHybridTopology(t *testing.T) {
952952
startAndConnectNodes(nodes, 10*time.Second)
953953

954954
// ensure the initial connectivity topology
955+
repeatCounter := 0
955956
require.Eventually(t, func() bool {
957+
repeatCounter++
956958
node0Conn := len(nodes[0].net.GetPeers(network.PeersConnectedIn)) > 0 // has connection from 1
957959
node1Conn := len(nodes[1].net.GetPeers(network.PeersConnectedOut, network.PeersConnectedIn)) == 2 // connected to 0 and 2
958960
node2Conn := len(nodes[2].net.GetPeers(network.PeersConnectedOut, network.PeersConnectedIn)) >= 1 // connected to 1
961+
if repeatCounter > 100 && !(node0Conn && node1Conn && node2Conn) {
962+
t.Logf("IN/OUT connection stats:\nNode0 %d/%d, Node1 %d/%d, Node2 %d/%d",
963+
len(nodes[0].net.GetPeers(network.PeersConnectedIn)), len(nodes[0].net.GetPeers(network.PeersConnectedOut)),
964+
len(nodes[1].net.GetPeers(network.PeersConnectedIn)), len(nodes[1].net.GetPeers(network.PeersConnectedOut)),
965+
len(nodes[2].net.GetPeers(network.PeersConnectedIn)), len(nodes[2].net.GetPeers(network.PeersConnectedOut)))
966+
}
959967
return node0Conn && node1Conn && node2Conn
960968
}, 60*time.Second, 500*time.Millisecond)
961969

0 commit comments

Comments
 (0)