From 065e2368025b9e4fdb4664462382a38ed698d545 Mon Sep 17 00:00:00 2001
From: Andrew Gillis <11790789+gammazero@users.noreply.github.com>
Date: Tue, 18 Feb 2025 06:28:09 -1000
Subject: [PATCH] Fix intermittent test failure (#849)

* Fix intermittent test failure
* Improve error reporting in test that sometimes fails
---
 bitswap/client/internal/messagequeue/messagequeue_test.go | 4 ++--
 go.mod                                                    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bitswap/client/internal/messagequeue/messagequeue_test.go b/bitswap/client/internal/messagequeue/messagequeue_test.go
index 24e61d662..c8f56319f 100644
--- a/bitswap/client/internal/messagequeue/messagequeue_test.go
+++ b/bitswap/client/internal/messagequeue/messagequeue_test.go
@@ -133,6 +133,7 @@ func collectMessages(ctx context.Context,
 	messagesSent <-chan []bsmsg.Entry,
 	timeout time.Duration,
 ) [][]bsmsg.Entry {
+	t.Helper()
 	var messagesReceived [][]bsmsg.Entry
 	timeoutctx, cancel := context.WithTimeout(ctx, timeout)
 	defer cancel()
@@ -317,7 +318,6 @@ func TestSendingMessagesPriority(t *testing.T) {
 }
 
 func TestCancelOverridesPendingWants(t *testing.T) {
-	t.Parallel()
 	ctx := context.Background()
 	messagesSent := make(chan []bsmsg.Entry)
 	resetChan := make(chan struct{}, 1)
@@ -400,7 +400,7 @@ func TestWantOverridesPendingCancels(t *testing.T) {
 
 	messages = collectMessages(ctx, t, messagesSent, collectTimeout)
 	if totalEntriesLength(messages) != 3 {
-		t.Fatal("Wrong message count", totalEntriesLength(messages))
+		t.Fatalf("Wrong message count, expected 3 got %d", totalEntriesLength(messages))
 	}
 
 	// Should send 1 want-block and 2 cancels
diff --git a/go.mod b/go.mod
index 96fde0c61..82eff09b3 100644
--- a/go.mod
+++ b/go.mod
@@ -12,7 +12,6 @@ require (
 	github.com/gabriel-vasile/mimetype v1.4.6
 	github.com/gammazero/chanqueue v1.0.0
 	github.com/gammazero/deque v1.0.0
-	github.com/gogo/protobuf v1.3.2
 	github.com/google/uuid v1.6.0
 	github.com/gorilla/mux v1.8.1
 	github.com/hashicorp/go-multierror v1.1.1
@@ -99,6 +98,7 @@ require (
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
 	github.com/godbus/dbus/v5 v5.1.0 // indirect
+	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/google/gopacket v1.1.19 // indirect
 	github.com/google/pprof v0.0.0-20250202011525-fc3143867406 // indirect
 	github.com/gopherjs/gopherjs v0.0.0-20190430165422-3e4dfb77656c // indirect