From 173f71f0514fd8a8bcdc0277f0701cf8a301d56f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Garillot?= Date: Mon, 16 Aug 2021 14:52:24 -0400 Subject: [PATCH] [network] Lint UnsubscribeTest --- network/test/middleware_test.go | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/network/test/middleware_test.go b/network/test/middleware_test.go index 5584f2d0ee5..7e0e222751e 100644 --- a/network/test/middleware_test.go +++ b/network/test/middleware_test.go @@ -394,40 +394,37 @@ func (m *MiddlewareTestSuite) TestUnsubscribe() { // set up waiting for m.size pubsub tags indicating a mesh has formed for i := 0; i < m.size; i++ { select { - case <-m.obs: + case msg := <-m.obs: + fmt.Printf("%v\n", msg) case <-time.After(2 * time.Second): assert.FailNow(m.T(), "could not receive pubsub tag indicating mesh formed") } } - origin := 0 - target := m.size - 1 - - originID := m.ids[origin].NodeID message1 := createMessage(firstNode, lastNode, "hello1") - m.ov[target].On("Receive", originID, mockery.Anything).Return(nil).Once() + m.ov[last].On("Receive", firstNode, mockery.Anything).Return(nil).Once() // first test that when both nodes are subscribed to the channel, the target node receives the message - err := m.mws[origin].Publish(message1, testChannel) + err := m.mws[first].Publish(message1, testChannel) assert.NoError(m.T(), err) assert.Eventually(m.T(), func() bool { - return m.ov[target].AssertCalled(m.T(), "Receive", originID, mockery.Anything) + return m.ov[last].AssertCalled(m.T(), "Receive", firstNode, mockery.Anything) }, 2*time.Second, time.Millisecond) // now unsubscribe the target node from the channel - err = m.mws[target].Unsubscribe(testChannel) + err = m.mws[last].Unsubscribe(testChannel) assert.NoError(m.T(), err) // create and send a new message on the channel from the origin node message2 := createMessage(firstNode, lastNode, "hello2") - err = m.mws[origin].Publish(message2, testChannel) + err = m.mws[first].Publish(message2, testChannel) assert.NoError(m.T(), err) // assert that the new message is not received by the target node assert.Never(m.T(), func() bool { - return !m.ov[target].AssertNumberOfCalls(m.T(), "Receive", 1) + return !m.ov[last].AssertNumberOfCalls(m.T(), "Receive", 1) }, 2*time.Second, time.Millisecond) }