fix: message queue test races on Windows

ipfs · Aug 13, 2022 · b8fd335 · b8fd335
1 parent ab72e8e
commit b8fd335
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 15 deletions.
diff --git a/client/internal/messagequeue/donthavetimeoutmgr_test.go b/client/internal/messagequeue/donthavetimeoutmgr_test.go
@@ -375,10 +375,10 @@ func TestDontHaveTimeoutMgrUsesDefaultTimeoutIfPingError(t *testing.T) {
 
 func TestDontHaveTimeoutMgrUsesDefaultTimeoutIfLatencyLonger(t *testing.T) {
 	ks := testutil.GenerateCids(2)
-	latency := time.Millisecond * 20
+	latency := time.Millisecond * 200
 	latMultiplier := 1
 	expProcessTime := time.Duration(0)
-	defaultTimeout := 10 * time.Millisecond
+	defaultTimeout := 100 * time.Millisecond
 	clock := clock.NewMock()
 	pinged := make(chan struct{})
 	pc := &mockPeerConn{latency: latency, clock: clock, pinged: pinged}
@@ -395,7 +395,7 @@ func TestDontHaveTimeoutMgrUsesDefaultTimeoutIfLatencyLonger(t *testing.T) {
 	dhtm.AddPending(ks)
 
 	// Sleep for less than the default timeout
-	clock.Add(defaultTimeout - 5*time.Millisecond)
+	clock.Add(defaultTimeout - 50*time.Millisecond)
 
 	// At this stage no timeout should have happened yet
 	if tr.timedOutCount() > 0 {

diff --git a/client/internal/messagequeue/messagequeue_test.go b/client/internal/messagequeue/messagequeue_test.go
@@ -167,7 +167,7 @@ func TestStartupAndShutdown(t *testing.T) {
 
 	messageQueue.Startup()
 	messageQueue.AddBroadcastWantHaves(bcstwh)
-	messages := collectMessages(ctx, t, messagesSent, 10*time.Millisecond)
+	messages := collectMessages(ctx, t, messagesSent, 100*time.Millisecond)
 	if len(messages) != 1 {
 		t.Fatal("wrong number of messages were sent for broadcast want-haves")
 	}
@@ -184,7 +184,7 @@ func TestStartupAndShutdown(t *testing.T) {
 
 	messageQueue.Shutdown()
 
-	timeoutctx, cancel := context.WithTimeout(ctx, 10*time.Millisecond)
+	timeoutctx, cancel := context.WithTimeout(ctx, 100*time.Millisecond)
 	defer cancel()
 	select {
 	case <-resetChan:
@@ -207,7 +207,7 @@ func TestSendingMessagesDeduped(t *testing.T) {
 	messageQueue.Startup()
 	messageQueue.AddWants(wantBlocks, wantHaves)
 	messageQueue.AddWants(wantBlocks, wantHaves)
-	messages := collectMessages(ctx, t, messagesSent, 10*time.Millisecond)
+	messages := collectMessages(ctx, t, messagesSent, 100*time.Millisecond)
 
 	if totalEntriesLength(messages) != len(wantHaves)+len(wantBlocks) {
 		t.Fatal("Messages were not deduped")
@@ -318,7 +318,7 @@ func TestCancelOverridesPendingWants(t *testing.T) {
 	messageQueue.Startup()
 	messageQueue.AddWants(wantBlocks, wantHaves)
 	messageQueue.AddCancels(cancels)
-	messages := collectMessages(ctx, t, messagesSent, 10*time.Millisecond)
+	messages := collectMessages(ctx, t, messagesSent, 100*time.Millisecond)
 
 	if totalEntriesLength(messages) != len(wantHaves)+len(wantBlocks)-len(cancels) {
 		t.Fatal("Wrong message count")
@@ -342,7 +342,7 @@ func TestCancelOverridesPendingWants(t *testing.T) {
 	// Cancel the remaining want-blocks and want-haves
 	cancels = append(wantHaves, wantBlocks...)
 	messageQueue.AddCancels(cancels)
-	messages = collectMessages(ctx, t, messagesSent, 10*time.Millisecond)
+	messages = collectMessages(ctx, t, messagesSent, 100*time.Millisecond)
 
 	// The remaining 2 cancels should be sent to the network as they are for
 	// wants that were sent to the network
@@ -370,7 +370,7 @@ func TestWantOverridesPendingCancels(t *testing.T) {
 	// Add 1 want-block and 2 want-haves
 	messageQueue.AddWants(wantBlocks, wantHaves)
 
-	messages := collectMessages(ctx, t, messagesSent, 10*time.Millisecond)
+	messages := collectMessages(ctx, t, messagesSent, 100*time.Millisecond)
 	if totalEntriesLength(messages) != len(wantBlocks)+len(wantHaves) {
 		t.Fatal("Wrong message count", totalEntriesLength(messages))
 	}
@@ -380,7 +380,7 @@ func TestWantOverridesPendingCancels(t *testing.T) {
 	// Override one cancel with a want-block (before cancel is sent to network)
 	messageQueue.AddWants(cids[:1], []cid.Cid{})
 
-	messages = collectMessages(ctx, t, messagesSent, 10*time.Millisecond)
+	messages = collectMessages(ctx, t, messagesSent, 100*time.Millisecond)
 	if totalEntriesLength(messages) != 3 {
 		t.Fatal("Wrong message count", totalEntriesLength(messages))
 	}
@@ -554,7 +554,7 @@ func TestSendToPeerThatDoesntSupportHave(t *testing.T) {
 	// Check broadcast want-haves
 	bcwh := testutil.GenerateCids(10)
 	messageQueue.AddBroadcastWantHaves(bcwh)
-	messages := collectMessages(ctx, t, messagesSent, 10*time.Millisecond)
+	messages := collectMessages(ctx, t, messagesSent, 100*time.Millisecond)
 
 	if len(messages) != 1 {
 		t.Fatal("wrong number of messages were sent", len(messages))
@@ -573,7 +573,7 @@ func TestSendToPeerThatDoesntSupportHave(t *testing.T) {
 	wbs := testutil.GenerateCids(10)
 	whs := testutil.GenerateCids(10)
 	messageQueue.AddWants(wbs, whs)
-	messages = collectMessages(ctx, t, messagesSent, 10*time.Millisecond)
+	messages = collectMessages(ctx, t, messagesSent, 100*time.Millisecond)
 
 	if len(messages) != 1 {
 		t.Fatal("wrong number of messages were sent", len(messages))
@@ -603,7 +603,7 @@ func TestSendToPeerThatDoesntSupportHaveMonitorsTimeouts(t *testing.T) {
 
 	wbs := testutil.GenerateCids(10)
 	messageQueue.AddWants(wbs, nil)
-	collectMessages(ctx, t, messagesSent, 10*time.Millisecond)
+	collectMessages(ctx, t, messagesSent, 100*time.Millisecond)
 
 	// Check want-blocks are added to DontHaveTimeoutMgr
 	if dhtm.pendingCount() != len(wbs) {
@@ -612,7 +612,7 @@ func TestSendToPeerThatDoesntSupportHaveMonitorsTimeouts(t *testing.T) {
 
 	cancelCount := 2
 	messageQueue.AddCancels(wbs[:cancelCount])
-	collectMessages(ctx, t, messagesSent, 10*time.Millisecond)
+	collectMessages(ctx, t, messagesSent, 100*time.Millisecond)
 
 	// Check want-blocks are removed from DontHaveTimeoutMgr
 	if dhtm.pendingCount() != len(wbs)-cancelCount {
@@ -685,7 +685,7 @@ func TestResponseReceivedAppliesForFirstResponseOnly(t *testing.T) {
 
 	// Add some wants and wait 10ms
 	messageQueue.AddWants(cids, nil)
-	collectMessages(ctx, t, messagesSent, 10*time.Millisecond)
+	collectMessages(ctx, t, messagesSent, 100*time.Millisecond)
 
 	// Receive a response for the wants
 	messageQueue.ResponseReceived(cids)