Fix race bug

waku-org · Sep 22, 2023 · 391b05b · 391b05b
1 parent d6fed8e
commit 391b05b
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/waku/v2/protocol/filter/filter_test.go b/waku/v2/protocol/filter/filter_test.go
@@ -117,7 +117,9 @@ func (s *FilterTestSuite) waitForMsg(fn func(), ch chan *protocol.Envelope) {
 		}
 	}()
 
-	fn()
+	if fn != nil {
+		fn()
+	}
 
 	s.wg.Wait()
 }
@@ -134,7 +136,7 @@ func (s *FilterTestSuite) waitForTimeout(fn func(), ch chan *protocol.Envelope)
 		case <-time.After(1 * time.Second):
 			// Timeout elapsed, all good
 		case <-s.ctx.Done():
-			s.Require().Fail("test exceeded allocated time")
+			s.Require().Fail("waitForTimeout test exceeded allocated time")
 		}
 	}()
 
@@ -241,6 +243,9 @@ func (s *FilterTestSuite) TestWakuFilter() {
 		s.publishMsg(s.testTopic, s.testContentTopic, "fifth")
 	}, secondSub[0].C)
 
+	s.waitForMsg(nil, s.subDetails[0].C)
+	s.waitForMsg(nil, secondSub[0].C)
+
 	// Unsubscribe from second sub only
 	_, err = s.lightNode.UnsubscribeWithSubscription(s.ctx, secondSub[0])
 	s.Require().NoError(err)