Drop peer request alloc reservations when peer is closed

[btrtrc.git] / ut-holepunching_test.go

diff --git a/ut-holepunching_test.go b/ut-holepunching_test.go
index 1b4b7d08c29aff12af0a0c5aff318b0dfe60be55..a45eb8e591d7154bdf211493ecbac7c6538b2d58 100644 (file)
--- a/ut-holepunching_test.go
+++ b/ut-holepunching_test.go
@@ -6,6 +6,8 @@ import (
        "testing"
        "testing/iotest"
 
+       "github.com/anacrolix/log"
+
        "github.com/anacrolix/torrent/internal/testutil"
        qt "github.com/frankban/quicktest"
        "github.com/stretchr/testify/assert"
@@ -23,8 +25,9 @@ func TestHolepunchConnect(t *testing.T) {
        cfg.MaxAllocPeerRequestDataPerConn = 4
        cfg.DataDir = greetingTempDir
        cfg.DisablePEX = true
-       //cfg.Debug = true
+       cfg.Debug = true
        cfg.AcceptPeerConnections = false
+       //cfg.DisableUTP = true
        seeder, err := NewClient(cfg)
        require.NoError(t, err)
        defer seeder.Close()
@@ -51,7 +54,7 @@ func TestHolepunchConnect(t *testing.T) {
        cfg.Seed = false
        cfg.DataDir = t.TempDir()
        cfg.MaxAllocPeerRequestDataPerConn = 4
-       cfg.Debug = true
+       //cfg.Debug = true
        //cfg.DisableUTP = true
        leecherLeecher, _ := NewClient(cfg)
        require.NoError(t, err)
@@ -85,12 +88,26 @@ func TestHolepunchConnect(t *testing.T) {
        waitForConns(seederTorrent)
        go llg.AddClientPeer(leecher)
        waitForConns(llg)
+       //time.Sleep(time.Second)
        llg.cl.lock()
+       targetAddr := seeder.ListenAddrs()[1]
+       log.Printf("trying to initiate to %v", targetAddr)
        llg.initiateConn(PeerInfo{
-               Addr: seeder.ListenAddrs()[0],
-       }, true, false)
+               Addr: targetAddr,
+       }, true, false, false, false)
        llg.cl.unlock()
        wg.Wait()
+       // These checks would require that the leecher leecher first attempt to connect without
+       // holepunching.
+
+       //llClientStats := leecherLeecher.Stats()
+       //c := qt.New(t)
+       //c.Check(llClientStats.NumPeersDialedRequiringHolepunch, qt.Not(qt.Equals), 0)
+       //c.Check(
+       //      llClientStats.NumPeersDialedRequiringHolepunch,
+       //      qt.Equals,
+       //      llClientStats.NumPeersUndiableWithoutHolepunch,
+       //)
 }
 
 func waitForConns(t *Torrent) {