From 58f279a6e1505e4be02aed50fb8443ae16149ff1 Mon Sep 17 00:00:00 2001 From: Matt Joiner Date: Thu, 23 Apr 2020 13:22:54 +1000 Subject: [PATCH] Take minimal fixes to TestReceiveChunkStorageFailure from master --- peerconn.go | 2 +- test/issue377_test.go | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) 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) -- 2.48.1