fixing race condition on tests

vechain · Dec 18, 2024 · 90c16b3 · 90c16b3
1 parent e0d13fe
commit 90c16b3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/api/subscriptions/pending_tx_test.go b/api/subscriptions/pending_tx_test.go
@@ -226,7 +226,9 @@ func TestPendingTx_UnsubscribeOnWebSocketClose(t *testing.T) {
 
 	// Wait to receive transaction
 	time.Sleep(500 * time.Millisecond)
+	sub.pendingTx.mu.Lock()
 	require.Equal(t, len(sub.pendingTx.listeners), 1)
+	sub.pendingTx.mu.Unlock()
 
 	// Simulate WebSocket closure
 	ws.WriteMessage(websocket.CloseMessage, websocket.FormatCloseMessage(websocket.CloseNormalClosure, ""))
@@ -236,5 +238,7 @@ func TestPendingTx_UnsubscribeOnWebSocketClose(t *testing.T) {
 	time.Sleep(5 * time.Second)
 
 	// Assert cleanup
+	sub.pendingTx.mu.Lock()
 	require.Equal(t, len(sub.pendingTx.listeners), 0)
+	sub.pendingTx.mu.Unlock()
 }
diff --git a/api/subscriptions/subscriptions.go b/api/subscriptions/subscriptions.go
@@ -386,32 +386,32 @@ func (s *Subscriptions) Mount(root *mux.Router, pathPrefix string) {
 
 	sub.Path("/txpool").
 		Methods(http.MethodGet).
-		Name("WS subscriptions/txpool").
+		Name("WS /subscriptions/txpool").
 		HandlerFunc(utils.WrapHandlerFunc(s.handlePendingTransactions))
 
 	sub.Path("/block").
 		Methods(http.MethodGet).
-		Name("WS subscriptions/block").
+		Name("WS /subscriptions/block").
 		HandlerFunc(utils.WrapHandlerFunc(s.websocket(s.handleBlockReader)))
 
 	sub.Path("/event").
 		Methods(http.MethodGet).
-		Name("WS subscriptions/event").
+		Name("WS /subscriptions/event").
 		HandlerFunc(utils.WrapHandlerFunc(s.websocket(s.handleEventReader)))
 
 	sub.Path("/transfer").
 		Methods(http.MethodGet).
-		Name("WS subscriptions/transfer").
+		Name("WS /subscriptions/transfer").
 		HandlerFunc(utils.WrapHandlerFunc(s.websocket(s.handleTransferReader)))
 
 	sub.Path("/beat2").
 		Methods(http.MethodGet).
-		Name("WS subscriptions/beat2").
+		Name("WS /subscriptions/beat2").
 		HandlerFunc(utils.WrapHandlerFunc(s.websocket(s.handleBeat2Reader)))
 
 	deprecatedBeat := sub.Path("/beat").
 		Methods(http.MethodGet).
-		Name("WS subscriptions/beat")
+		Name("WS /subscriptions/beat")
 
 	if s.enabledDeprecated {
 		deprecatedBeat.HandlerFunc(utils.WrapHandlerFunc(s.websocket(s.handleBeatReader)))