status-im
/
status-go
mirror of https://github.com/status-im/status-go.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Correctly shutdown messengers

This commit is contained in:
Andrea Maria Piana 2023-06-29 11:28:42 +01:00
parent d91d11a01c
commit 190094e40d
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
protocol/push_notification_test.go
View File

@ -93,10 +93,12 @@ func (s *MessengerPushNotificationSuite) TestReceivePushNotification() {
bob1 := s.m bob1 := s.m
bob2, err := newMessengerWithKey(s.shh, s.m.identity, s.logger, []Option{WithPushNotifications()}) bob2, err := newMessengerWithKey(s.shh, s.m.identity, s.logger, []Option{WithPushNotifications()})
s.Require().NoError(err) s.Require().NoError(err)
defer bob2.Shutdown() // nolint: errcheck
serverKey, err := crypto.GenerateKey() serverKey, err := crypto.GenerateKey()
s.Require().NoError(err) s.Require().NoError(err)
server := s.newPushNotificationServer(s.shh, serverKey) server := s.newPushNotificationServer(s.shh, serverKey)
defer server.Shutdown() // nolint: errcheck
alice := s.newMessenger(s.shh) alice := s.newMessenger(s.shh)
// start alice and enable sending push notifications // start alice and enable sending push notifications
@ -270,9 +272,6 @@ func (s *MessengerPushNotificationSuite) TestReceivePushNotification() {
return nil return nil
}) })
s.Require().NoError(err) s.Require().NoError(err)
s.Require().NoError(bob2.Shutdown())
s.Require().NoError(alice.Shutdown())
s.Require().NoError(server.Shutdown())
} }
func (s *MessengerPushNotificationSuite) TestReceivePushNotificationFromContactOnly() { func (s *MessengerPushNotificationSuite) TestReceivePushNotificationFromContactOnly() {
@ -282,6 +281,7 @@ func (s *MessengerPushNotificationSuite) TestReceivePushNotificationFromContactO
serverKey, err := crypto.GenerateKey() serverKey, err := crypto.GenerateKey()
s.Require().NoError(err) s.Require().NoError(err)
server := s.newPushNotificationServer(s.shh, serverKey) server := s.newPushNotificationServer(s.shh, serverKey)
defer server.Shutdown() // nolint: errcheck
alice := s.newMessenger(s.shh) alice := s.newMessenger(s.shh)
// start alice and enable push notifications // start alice and enable push notifications
@ -414,8 +414,6 @@ func (s *MessengerPushNotificationSuite) TestReceivePushNotificationFromContactO
}) })
s.Require().NoError(err) s.Require().NoError(err)
s.Require().NoError(alice.Shutdown())
s.Require().NoError(server.Shutdown())
} }
func (s *MessengerPushNotificationSuite) TestReceivePushNotificationRetries() { func (s *MessengerPushNotificationSuite) TestReceivePushNotificationRetries() {
@ -425,6 +423,7 @@ func (s *MessengerPushNotificationSuite) TestReceivePushNotificationRetries() {
serverKey, err := crypto.GenerateKey() serverKey, err := crypto.GenerateKey()
s.Require().NoError(err) s.Require().NoError(err)
server := s.newPushNotificationServer(s.shh, serverKey) server := s.newPushNotificationServer(s.shh, serverKey)
defer server.Shutdown() // nolint: errcheck
alice := s.newMessenger(s.shh) alice := s.newMessenger(s.shh)
// another contact to invalidate the token // another contact to invalidate the token
@ -643,8 +642,6 @@ func (s *MessengerPushNotificationSuite) TestReceivePushNotificationRetries() {
}) })
s.Require().NoError(err) s.Require().NoError(err)
s.Require().NoError(alice.Shutdown())
s.Require().NoError(server.Shutdown())
} }
func (s *MessengerPushNotificationSuite) TestContactCode() { func (s *MessengerPushNotificationSuite) TestContactCode() {