Skip to content
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.

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

tests: disable TestP2PRelay on CI #6059

Merged
merged 6 commits into from
Jul 10, 2024
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
5 changes: 4 additions & 1 deletion ledger/ledger_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1792,6 +1792,9 @@ func TestLedgerMemoryLeak(t *testing.T) {
log := logging.TestingLog(t)
log.SetLevel(logging.Info) // prevent spamming with ledger.AddValidatedBlock debug message
deadlock.Opts.Disable = true // catchpoint writing might take long
defer func() {
deadlock.Opts.Disable = false
}()
l, err := OpenLedger(log, dbName, inMem, genesisInitState, cfg)
require.NoError(t, err)
defer l.Close()
Expand Down Expand Up @@ -2898,7 +2901,7 @@ func testVotersReloadFromDiskAfterOneStateProofCommitted(t *testing.T, cfg confi
const inMem = true

log := logging.TestingLog(t)
log.SetLevel(logging.Info)
log.SetLevel(logging.Debug)
l, err := OpenLedger(log, dbName, inMem, genesisInitState, cfg)
require.NoError(t, err)
defer l.Close()
Expand Down
25 changes: 21 additions & 4 deletions network/p2pNetwork_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import (
"fmt"
"io"
"net/http"
"slices"
"sync"
"sync/atomic"
"testing"
Expand Down Expand Up @@ -52,6 +53,13 @@ func (n *P2PNetwork) hasPeers() bool {
return len(n.wsPeers) > 0
}

func (n *P2PNetwork) hasPeer(peerID peer.ID) bool {
n.wsPeersLock.RLock()
defer n.wsPeersLock.RUnlock()
_, ok := n.wsPeers[peerID]
return ok
}

func TestP2PSubmitTX(t *testing.T) {
partitiontest.PartitionTest(t)

Expand Down Expand Up @@ -795,7 +803,9 @@ func TestP2PRelay(t *testing.T) {
partitiontest.PartitionTest(t)

cfg := config.GetDefaultLocal()
cfg.DNSBootstrapID = "" // disable DNS lookups since the test uses phonebook addresses
cfg.ForceFetchTransactions = true
cfg.BaseLoggerDebugLevel = 5
log := logging.TestingLog(t)
log.Debugln("Starting netA")
netA, err := NewP2PNetwork(log.With("net", "netA"), cfg, "", nil, genesisID, config.Devtestnet, &nopeNodeInfo{})
Expand Down Expand Up @@ -892,16 +902,23 @@ func TestP2PRelay(t *testing.T) {
require.Eventually(
t,
func() bool {
return len(netA.service.ListPeersForTopic(p2p.TXTopicName)) >= 2 &&
len(netB.service.ListPeersForTopic(p2p.TXTopicName)) > 0 &&
len(netC.service.ListPeersForTopic(p2p.TXTopicName)) > 0
netAtopicPeers := netA.service.ListPeersForTopic(p2p.TXTopicName)
netBtopicPeers := netB.service.ListPeersForTopic(p2p.TXTopicName)
netCtopicPeers := netC.service.ListPeersForTopic(p2p.TXTopicName)
netBConnected := slices.Contains(netAtopicPeers, netB.service.ID())
netCConnected := slices.Contains(netAtopicPeers, netC.service.ID())
return len(netAtopicPeers) >= 2 &&
len(netBtopicPeers) > 0 &&
len(netCtopicPeers) > 0 &&
netBConnected && netCConnected
},
10*time.Second, // wait until netC node gets actually connected to netA after starting
50*time.Millisecond,
)

require.Eventually(t, func() bool {
return netA.hasPeers() && netB.hasPeers() && netC.hasPeers()
return netA.hasPeers() && netB.hasPeers() && netC.hasPeers() &&
netA.hasPeer(netB.service.ID()) && netA.hasPeer(netC.service.ID())
}, 2*time.Second, 50*time.Millisecond)

const expectedMsgs = 10
Expand Down
Loading