Skip to content

tests: network flaky tests fixes #6407

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cce merged 4 commits into from
Aug 5, 2025
Merged

tests: network flaky tests fixes #6407

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cdcc9cd
tests: increase wait ready timeout to 5s
Aug 5, 2025
a611c43
tests: fix TestP2PwsStreamHandlerDedup
Aug 5, 2025
3178f11
tests: debug output for TestNodeHybridTopology
Aug 5, 2025
f6e986a
Merge remote-tracking branch 'upstream/master' into pavel/network-tim…
cce Aug 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion network/p2pNetwork_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1250,7 +1250,7 @@ func TestP2PwsStreamHandlerDedup(t *testing.T) {
defer netB.Stop()

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

// now allow the peer made outgoing connection to handle conn closing initiated by the other side
Expand Down
2 changes: 1 addition & 1 deletion network/wsNetwork_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@ func setupWebsocketNetworkABwithLogger(t *testing.T, countTarget int, log loggin
counter := newMessageCounter(t, countTarget)
netB.RegisterHandlers([]TaggedMessageHandler{{Tag: protocol.TxnTag, MessageHandler: counter}})

readyTimeout := time.NewTimer(2 * time.Second)
readyTimeout := time.NewTimer(5 * time.Second)
waitReady(t, netA, readyTimeout.C)
t.Log("a ready")
waitReady(t, netB, readyTimeout.C)
Expand Down
8 changes: 8 additions & 0 deletions node/node_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -952,10 +952,18 @@ func TestNodeHybridTopology(t *testing.T) {
startAndConnectNodes(nodes, 10*time.Second)

// ensure the initial connectivity topology
repeatCounter := 0
require.Eventually(t, func() bool {
repeatCounter++
node0Conn := len(nodes[0].net.GetPeers(network.PeersConnectedIn)) > 0 // has connection from 1
node1Conn := len(nodes[1].net.GetPeers(network.PeersConnectedOut, network.PeersConnectedIn)) == 2 // connected to 0 and 2
node2Conn := len(nodes[2].net.GetPeers(network.PeersConnectedOut, network.PeersConnectedIn)) >= 1 // connected to 1
if repeatCounter > 100 && !(node0Conn && node1Conn && node2Conn) {
Comment thread
algorandskiy marked this conversation as resolved.
t.Logf("IN/OUT connection stats:\nNode0 %d/%d, Node1 %d/%d, Node2 %d/%d",
len(nodes[0].net.GetPeers(network.PeersConnectedIn)), len(nodes[0].net.GetPeers(network.PeersConnectedOut)),
len(nodes[1].net.GetPeers(network.PeersConnectedIn)), len(nodes[1].net.GetPeers(network.PeersConnectedOut)),
len(nodes[2].net.GetPeers(network.PeersConnectedIn)), len(nodes[2].net.GetPeers(network.PeersConnectedOut)))
}
return node0Conn && node1Conn && node2Conn
}, 60*time.Second, 500*time.Millisecond)

Expand Down
Loading