From fd4c627c2ecec607fdcd3c6058794cc06668a793 Mon Sep 17 00:00:00 2001 From: Andrea Maria Piana Date: Fri, 20 Mar 2020 16:49:46 +0100 Subject: [PATCH] Ignore full node flag when in topic mode --- metrics/node/metrics_test.go | 3 --- protocol/messenger_test.go | 2 ++ services/shhext/api_geth_test.go | 4 ++-- services/wakuext/api_test.go | 4 +++- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/metrics/node/metrics_test.go b/metrics/node/metrics_test.go index d61bbf52b..bb53ba4fe 100644 --- a/metrics/node/metrics_test.go +++ b/metrics/node/metrics_test.go @@ -5,9 +5,6 @@ import ( "github.com/stretchr/testify/require" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - prom "github.com/prometheus/client_golang/prometheus" ) diff --git a/protocol/messenger_test.go b/protocol/messenger_test.go index eba4e8547..d51e30fc2 100644 --- a/protocol/messenger_test.go +++ b/protocol/messenger_test.go @@ -876,6 +876,7 @@ func (s *MessengerSuite) TestRetrieveTheirPrivateGroupChat() { // Test receiving a message on an existing private group chat, if messages // are not wrapped this will fail as they'll likely come out of order // NOTE: Disabling this as too flaky +/* func (s *MessengerSuite) testRetrieveTheirPrivateGroupWrappedMessageChat() { var response *MessengerResponse theirMessenger := s.newMessenger(s.shh) @@ -932,6 +933,7 @@ func (s *MessengerSuite) testRetrieveTheirPrivateGroupWrappedMessageChat() { // It sets the last message s.Require().NotNil(actualChat.LastMessage) } +*/ func (s *MessengerSuite) TestChatPersistencePublic() { chat := Chat{ diff --git a/services/shhext/api_geth_test.go b/services/shhext/api_geth_test.go index 60781e84b..30d5ed990 100644 --- a/services/shhext/api_geth_test.go +++ b/services/shhext/api_geth_test.go @@ -438,7 +438,7 @@ type RequestMessagesSyncSuite struct { } // NOTE: Disabling this for now as too flaky -func (s *RequestMessagesSyncSuite) testExpired() { +/*func (s *RequestMessagesSyncSuite) TestExpired() { // intentionally discarding all requests, so that request will timeout go func() { for { @@ -456,7 +456,7 @@ func (s *RequestMessagesSyncSuite) testExpired() { }, ) s.Require().EqualError(err, "failed to request messages after 1 retries") -} +}*/ func (s *RequestMessagesSyncSuite) testCompletedFromAttempt(target int) { const cursorSize = 36 // taken from mailserver_response.go from whisper package diff --git a/services/wakuext/api_test.go b/services/wakuext/api_test.go index 5fb232ed1..a352f08bd 100644 --- a/services/wakuext/api_test.go +++ b/services/wakuext/api_test.go @@ -336,7 +336,8 @@ type RequestMessagesSyncSuite struct { } // NOTE: Disabling this for now as too flaky -func (s *RequestMessagesSyncSuite) testExpired() { +/* +func (s *RequestMessagesSyncSuite) TestExpired() { // intentionally discarding all requests, so that request will timeout go func() { for { @@ -356,6 +357,7 @@ func (s *RequestMessagesSyncSuite) testExpired() { ) s.Require().EqualError(err, "failed to request messages after 1 retries") } +*/ func (s *RequestMessagesSyncSuite) testCompletedFromAttempt(target int) { const cursorSize = 36 // taken from mailserver_response.go from waku package