X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=torrent_test.go;h=808947e974a23fe9df13e8fb5714eac781445305;hb=8e2139b33597b0565bdffcb5b51692d36b3af0b8;hp=b413a39e8c928926cb6c0dfa60a6872540c9d25c;hpb=22c5a94a6af96940754ded5c83dc7f4f493b0348;p=btrtrc.git

diff --git a/torrent_test.go b/torrent_test.go
index b413a39e..808947e9 100644
--- a/torrent_test.go
+++ b/torrent_test.go
@@ -6,11 +6,14 @@ import (
 	"net"
 	"os"
 	"path/filepath"
+	"sync"
 	"testing"
 
+	g "github.com/anacrolix/generics"
+	"github.com/anacrolix/log"
 	"github.com/anacrolix/missinggo/v2"
 	"github.com/anacrolix/missinggo/v2/bitmap"
-	"github.com/bradfitz/iter"
+	qt "github.com/frankban/quicktest"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
@@ -90,8 +93,9 @@ func BenchmarkUpdatePiecePriorities(b *testing.B) {
 		PieceLength: pieceLength,
 		Length:      pieceLength * numPieces,
 	}))
+	t.onSetInfo()
 	assert.EqualValues(b, 13410, t.numPieces())
-	for range iter.N(7) {
+	for i := 0; i < 7; i += 1 {
 		r := t.NewReader()
 		r.SetReadahead(32 << 20)
 		r.Seek(3500000, io.SeekStart)
@@ -101,8 +105,8 @@ func BenchmarkUpdatePiecePriorities(b *testing.B) {
 		t._completedPieces.Add(bitmap.BitIndex(i))
 	}
 	t.DownloadPieces(0, t.numPieces())
-	for range iter.N(b.N) {
-		t.updateAllPiecePriorities()
+	for i := 0; i < b.N; i += 1 {
+		t.updateAllPiecePriorities("")
 	}
 }
 
@@ -129,6 +133,7 @@ func testEmptyFilesAndZeroPieceLength(t *testing.T, cfg *ClientConfig) {
 	defer tt.Drop()
 	tt.DownloadAll()
 	require.True(t, cl.WaitAll())
+	assert.True(t, tt.Complete.Bool())
 	assert.True(t, missinggo.FilePathExists(fp))
 }
 
@@ -142,14 +147,14 @@ func TestEmptyFilesAndZeroPieceLengthWithFileStorage(t *testing.T) {
 
 func TestPieceHashFailed(t *testing.T) {
 	mi := testutil.GreetingMetaInfo()
-	cl := new(Client)
-	cl.config = TestingConfig(t)
-	cl.initLogger()
+	cl := newTestingClient(t)
 	tt := cl.newTorrent(mi.HashInfoBytes(), badStorage{})
 	tt.setChunkSize(2)
-	require.NoError(t, tt.setInfoBytes(mi.InfoBytes))
+	require.NoError(t, tt.setInfoBytesLocked(mi.InfoBytes))
 	tt.cl.lock()
-	tt.pieces[1]._dirtyChunks.AddRange(0, 3)
+	tt.dirtyChunks.AddRange(
+		uint64(tt.pieceRequestIndexOffset(1)),
+		uint64(tt.pieceRequestIndexOffset(1)+3))
 	require.True(t, tt.pieceAllDirty(1))
 	tt.pieceHashed(1, false, nil)
 	// Dirty chunks should be cleared so we can try again.
@@ -161,6 +166,8 @@ func TestPieceHashFailed(t *testing.T) {
 func TestTorrentMetainfoIncompleteMetadata(t *testing.T) {
 	cfg := TestingConfig(t)
 	cfg.Debug = true
+	// Disable this just because we manually initiate a connection without it.
+	cfg.MinPeerExtensions.SetBit(pp.ExtensionBitFast, false)
 	cl, err := NewClient(cfg)
 	require.NoError(t, err)
 	defer cl.Close()
@@ -177,10 +184,10 @@ func TestTorrentMetainfoIncompleteMetadata(t *testing.T) {
 	defer nc.Close()
 
 	var pex PeerExtensionBits
-	pex.SetBit(pp.ExtensionBitExtended, true)
+	pex.SetBit(pp.ExtensionBitLtep, true)
 	hr, err := pp.Handshake(nc, &ih, [20]byte{}, pex)
 	require.NoError(t, err)
-	assert.True(t, hr.PeerExtensionBits.GetBit(pp.ExtensionBitExtended))
+	assert.True(t, hr.PeerExtensionBits.GetBit(pp.ExtensionBitLtep))
 	assert.EqualValues(t, cl.PeerID(), hr.PeerID)
 	assert.EqualValues(t, ih, hr.Hash)
 
@@ -212,3 +219,35 @@ func TestTorrentMetainfoIncompleteMetadata(t *testing.T) {
 	assert.False(t, tt.haveAllMetadataPieces())
 	assert.Nil(t, tt.Metainfo().InfoBytes)
 }
+
+func TestRelativeAvailabilityHaveNone(t *testing.T) {
+	c := qt.New(t)
+	var err error
+	cl := Client{
+		config: TestingConfig(t),
+	}
+	tt := Torrent{
+		cl:           &cl,
+		logger:       log.Default,
+		gotMetainfoC: make(chan struct{}),
+	}
+	tt.setChunkSize(2)
+	g.MakeMapIfNil(&tt.conns)
+	pc := PeerConn{}
+	pc.t = &tt
+	pc.peerImpl = &pc
+	pc.initRequestState()
+	g.InitNew(&pc.callbacks)
+	tt.conns[&pc] = struct{}{}
+	err = pc.peerSentHave(0)
+	c.Assert(err, qt.IsNil)
+	info := testutil.Greeting.Info(5)
+	err = tt.setInfo(&info)
+	c.Assert(err, qt.IsNil)
+	tt.onSetInfo()
+	err = pc.peerSentHaveNone()
+	c.Assert(err, qt.IsNil)
+	var wg sync.WaitGroup
+	tt.close(&wg)
+	tt.assertAllPiecesRelativeAvailabilityZero()
+}