AtHeartEngineer/mvds
1
0
Fork 0
mirror of https://github.com/vacp2p/mvds.git synced 2026-01-09 14:47:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

remove/eventually (#78)

Browse Source
This commit is contained in:
Dean Eigenmann
2019-10-29 16:32:35 +01:00
committed by GitHub
parent 217a49bd54
commit 463f9a7f6c
2 changed files with 19 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
mvds_batch_test.go
View File

@@ -80,14 +80,12 @@ func (s *MVDSBatchSuite) TestSendClient1ToClient2() {
s.Require().NoError(err)
s.Require().NotNil(message1Sender)
// Check message is received
s.Require().Eventually(func() bool {
message1Receiver, err := s.ds2.Get(messageID)
return err == nil && message1Receiver != nil
}, 1*time.Second, 10*time.Millisecond)
message := <-subscription
s.Equal(message.Body, content)
message1Receiver, err := s.ds2.Get(messageID)
s.Require().NoError(err)
s.Require().NotNil(message1Receiver)
}
func (s *MVDSBatchSuite) TestSendClient2ToClient1() {
@@ -102,17 +100,16 @@ func (s *MVDSBatchSuite) TestSendClient2ToClient1() {
s.Require().NoError(err)
s.Require().NotNil(message1Sender)
// Check message is received
s.Require().Eventually(func() bool {
message1Receiver, err := s.ds1.Get(messageID)
return err == nil && message1Receiver != nil
}, 1*time.Second, 10*time.Millisecond)
message := <-subscription
s.Equal(message.Body, content)
message1Receiver, err := s.ds1.Get(messageID)
s.Require().NoError(err)
s.Require().NotNil(message1Receiver)
}
func (s *MVDSBatchSuite) TestAcks() {
subscription := s.client2.Subscribe()
messageID, err := s.client1.AppendMessage(s.groupID, []byte("message 1"))
s.Require().NoError(err)
@@ -126,11 +123,11 @@ func (s *MVDSBatchSuite) TestAcks() {
s.Require().NoError(err)
s.Require().Equal(1, len(states))
// Check message is received
s.Require().Eventually(func() bool {
message1Receiver, err := s.ds2.Get(messageID)
return err == nil && message1Receiver != nil
}, 1*time.Second, 10*time.Millisecond)
<-subscription
message1Receiver, err := s.ds2.Get(messageID)
s.Require().NoError(err)
s.Require().NotNil(message1Receiver)
// Check state is removed
s.Require().Eventually(func() bool {

10
mvds_interactive_test.go
View File

@@ -68,6 +68,7 @@ func (s *MVDSInteractiveSuite) TearDownTest() {
}
func (s *MVDSInteractiveSuite) TestInteractiveMode() {
subscription := s.client2.Subscribe()
messageID, err := s.client1.AppendMessage(s.groupID, []byte("message 1"))
s.Require().NoError(err)
@@ -87,11 +88,10 @@ func (s *MVDSInteractiveSuite) TestInteractiveMode() {
return err == nil && len(states) == 1 && states[0].Type == state.REQUEST
}, 1*time.Second, 10*time.Millisecond, "An request is stored in the state")
// Check we eventually get the message
s.Require().Eventually(func() bool {
message1Receiver, err := s.ds1.Get(messageID)
return err == nil && message1Receiver != nil
}, 1*time.Second, 10*time.Millisecond, "The message is eventually received")
<-subscription
message1Receiver, err := s.ds2.Get(messageID)
s.Require().NoError(err)
s.Require().NotNil(message1Receiver)
// Check state is removed
s.Require().Eventually(func() bool {