From: Matt Joiner <anacrolix@gmail.com>
Date: Thu, 23 Apr 2020 03:22:54 +0000 (+1000)
Subject: Take minimal fixes to TestReceiveChunkStorageFailure from master
X-Git-Tag: v1.15.1~1
X-Git-Url: http://www.git.stargrave.org/?a=commitdiff_plain;h=58f279a6e1505e4be02aed50fb8443ae16149ff1;p=btrtrc.git

Take minimal fixes to TestReceiveChunkStorageFailure from master
---

diff --git a/peerconn.go b/peerconn.go
index ee5cdfd9..b38fedb2 100644
--- 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 40ed8916..b6f76178 100644
--- 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)