From b52aa184d62d173e2456f1c80df9c85253c27e21 Mon Sep 17 00:00:00 2001 From: Sergey Cherepanov Date: Fri, 22 Dec 2023 17:36:51 +0100 Subject: [PATCH] fix tests --- commonspace/headsync/diffsyncer_test.go | 4 ++++ net/peer/mock_peer/mock_peer.go | 14 ++++++++++++++ net/pool/pool_test.go | 18 ++++++++++++------ 3 files changed, 30 insertions(+), 6 deletions(-) diff --git a/commonspace/headsync/diffsyncer_test.go b/commonspace/headsync/diffsyncer_test.go index cf5af467..54bef04a 100644 --- a/commonspace/headsync/diffsyncer_test.go +++ b/commonspace/headsync/diffsyncer_test.go @@ -59,6 +59,10 @@ func (p pushSpaceRequestMatcher) String() string { type mockPeer struct { } +func (m mockPeer) CloseChan() <-chan struct{} { + return nil +} + func (m mockPeer) SetTTL(ttl time.Duration) { return } diff --git a/net/peer/mock_peer/mock_peer.go b/net/peer/mock_peer/mock_peer.go index 6522ca18..4ace14a8 100644 --- a/net/peer/mock_peer/mock_peer.go +++ b/net/peer/mock_peer/mock_peer.go @@ -69,6 +69,20 @@ func (mr *MockPeerMockRecorder) Close() *gomock.Call { return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Close", reflect.TypeOf((*MockPeer)(nil).Close)) } +// CloseChan mocks base method. +func (m *MockPeer) CloseChan() <-chan struct{} { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "CloseChan") + ret0, _ := ret[0].(<-chan struct{}) + return ret0 +} + +// CloseChan indicates an expected call of CloseChan. +func (mr *MockPeerMockRecorder) CloseChan() *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CloseChan", reflect.TypeOf((*MockPeer)(nil).CloseChan)) +} + // Context mocks base method. func (m *MockPeer) Context() context.Context { m.ctrl.T.Helper() diff --git a/net/pool/pool_test.go b/net/pool/pool_test.go index 741671b6..b04fffcf 100644 --- a/net/pool/pool_test.go +++ b/net/pool/pool_test.go @@ -4,16 +4,18 @@ import ( "context" "errors" "fmt" + net2 "net" + "testing" + "time" + + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "storj.io/drpc" + "github.com/anyproto/any-sync/app" "github.com/anyproto/any-sync/net" "github.com/anyproto/any-sync/net/peer" "github.com/anyproto/any-sync/net/secureservice/handshake" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" - net2 "net" - "storj.io/drpc" - "testing" - "time" ) var ctx = context.Background() @@ -276,3 +278,7 @@ func (t *testPeer) IsClosed() bool { return false } } + +func (t *testPeer) CloseChan() <-chan struct{} { + return t.closed +}