Take minimal fixes to TestReceiveChunkStorageFailure from master

diff --git a/peerconn.go b/peerconn.go
index ee5cdfd986216ee2509098a4d7ea6c496c969cd3..b38fedb27c284b84f4116fec9384f5753bcffb59 100644 (file)
--- a/peerconn.go
+++ b/peerconn.go
@@ -1184,7 +1184,7 @@ func (c *PeerConn) receiveChunk(msg *pp.Message) error {
 
        if _, ok := c.validReceiveChunks[req]; !ok {
                torrent.Add("chunks received unexpected", 1)
-               return errors.New("received unexpected chunk")
+               //return errors.New("received unexpected chunk")
        }
        delete(c.validReceiveChunks, req)
 

diff --git a/test/issue377_test.go b/test/issue377_test.go
index 40ed8916e0ddb72348156c3a94642d5dbd487ec9..b6f761787d57f1e00cb75f1bcb30eea774b249ef 100644 (file)
--- a/test/issue377_test.go
+++ b/test/issue377_test.go
@@ -2,11 +2,12 @@ package test
 
 import (
        "errors"
-       "log"
        "os"
        "sync"
        "testing"
 
+       "github.com/anacrolix/log"
+
        "github.com/stretchr/testify/assert"
        "github.com/stretchr/testify/require"
 
@@ -34,12 +35,14 @@ func TestReceiveChunkStorageFailure(t *testing.T) {
        seederClientConfig.Debug = true
        seederClient, err := torrent.NewClient(seederClientConfig)
        require.NoError(t, err)
+       defer seederClient.Close()
        defer testutil.ExportStatusWriter(seederClient, "s")()
        leecherClientConfig := torrent.TestingConfig()
        leecherClientConfig.Debug = true
        justOneNetwork(leecherClientConfig)
        leecherClient, err := torrent.NewClient(leecherClientConfig)
        require.NoError(t, err)
+       defer leecherClient.Close()
        defer testutil.ExportStatusWriter(leecherClient, "l")()
        info, err := metainfo.UnmarshalInfo()
        require.NoError(t, err)