Skip to content

[r3.6] db/downloader: keep the BT discovery tests off UDP #23205

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
AskAlexSharov merged 1 commit into from
Aug 12, 2026
+17 −18
Merged

[r3.6] db/downloader: keep the BT discovery tests off UDP #23205

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
35 changes: 17 additions & 18 deletions db/downloader/bt_peer_discovery_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,7 @@ func TestBTPeerDiscovery_AddPeersFromENR(t *testing.T) {
require.NoError(t, os.WriteFile(filepath.Join(seederDir, testFile), testData, 0o644))

// Start seeder torrent client.
seederCfg := torrent.NewDefaultClientConfig()
seederCfg.DataDir = seederDir
seederCfg.ListenPort = 0 // OS-assigned port
seederCfg.NoDHT = true
seederCfg.DisableTrackers = true
seederCfg := newTestClientConfig(t, seederDir)
seederCfg.Seed = true

seeder, err := torrent.NewClient(seederCfg)
Expand Down Expand Up @@ -71,13 +67,7 @@ func TestBTPeerDiscovery_AddPeersFromENR(t *testing.T) {
assert.Equal(t, [20]byte(infoHash), best.ChainToml.InfoHash)

// Start leecher torrent client.
leecherCfg := torrent.NewDefaultClientConfig()
leecherCfg.DataDir = leecherDir
leecherCfg.ListenPort = 0
leecherCfg.NoDHT = true
leecherCfg.DisableTrackers = true

leecher, err := torrent.NewClient(leecherCfg)
leecher, err := torrent.NewClient(newTestClientConfig(t, leecherDir))
require.NoError(t, err)
defer leecher.Close()

Expand Down Expand Up @@ -117,12 +107,7 @@ func TestBTPeerDiscovery_NoBTPort(t *testing.T) {

peer := &ChainTomlPeer{ChainToml: *ct, Node: node}

// Create a minimal torrent client for the test.
cfg := torrent.NewDefaultClientConfig()
cfg.DataDir = t.TempDir()
cfg.ListenPort = 0
cfg.NoDHT = true
client, err := torrent.NewClient(cfg)
client, err := torrent.NewClient(newTestClientConfig(t, t.TempDir()))
require.NoError(t, err)
defer client.Close()

Expand All @@ -134,6 +119,20 @@ func TestBTPeerDiscovery_NoBTPort(t *testing.T) {
assert.Zero(t, torr.Stats().TotalPeers)
}

// newTestClientConfig returns a client that talks to nobody it was not handed
// directly. DisableUTP also keeps the listener off UDP, which the OS may refuse
// on the dynamic port the TCP listener already took.
func newTestClientConfig(t *testing.T, dataDir string) *torrent.ClientConfig {
t.Helper()
cfg := torrent.NewDefaultClientConfig()
cfg.DataDir = dataDir
cfg.ListenPort = 0
cfg.NoDHT = true
cfg.DisableTrackers = true
cfg.DisableUTP = true
return cfg
}

func buildTestMetainfo(t *testing.T, dir, filename string) metainfo.MetaInfo {
t.Helper()
info := metainfo.Info{
Expand Down
Loading