From dee470360ec879b519c8325df4459f76c425546e Mon Sep 17 00:00:00 2001
From: Jono Wenger <jono@elixxir.io>
Date: Mon, 7 Jun 2021 16:56:18 -0700
Subject: [PATCH] Fix TestManager_ProcessMessageRetrieval_Quit again
---
network/rounds/retrieve_test.go | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/network/rounds/retrieve_test.go b/network/rounds/retrieve_test.go
index 59ebacd4f..856fa05fa 100644
--- a/network/rounds/retrieve_test.go
+++ b/network/rounds/retrieve_test.go
@@ -294,15 +294,17 @@ func TestManager_ProcessMessageRetrieval_Quit(t *testing.T) {
messageBundleChan := make(chan message.Bundle)
testManager.messageBundles = messageBundleChan
+ // Initialize the message retrieval
+ go testManager.processMessageRetrieval(mockComms, stop)
+
// Close the process early, before any logic below can be completed
if err := stop.Close(); err != nil {
t.Errorf("Failed to signal close to process: %+v", err)
}
- time.Sleep(250 * time.Millisecond)
-
- // Initialize the message retrieval
- go testManager.processMessageRetrieval(mockComms, stop)
+ if err := stoppable.WaitForStopped(stop, 300*time.Millisecond); err != nil {
+ t.Fatalf("Failed to stop stoppable: %+v", err)
+ }
// Construct expected values for checking
expectedEphID := ephemeral.Id{1, 2, 3, 4, 5, 6, 7, 8}
--
GitLab