From d3bfb3bb7bef7e67ea62b41940ac240082c74532 Mon Sep 17 00:00:00 2001
From: rcourtman <courtmanr@gmail.com>
Date: Tue, 25 Aug 2026 07:19:24 +0100
Subject: [PATCH] Tolerate heartbeat pings in websocket initial state test

TestWebSocketSendsInitialState asserted initialState arrives as the
second message, but the hub interleaves 30s heartbeat pings with the
connect sequence, so a slow state build on a loaded runner put a ping
there first and reddened main twice in three runs. Wait for each
expected type the way TestWebsocketPayloadContractShape already does.
The delivery and payload assertions are unchanged.
---
 internal/api/router_integration_test.go | 32 ++++++++++++-------------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/internal/api/router_integration_test.go b/internal/api/router_integration_test.go
index d6690535c..f8121f367 100644
--- a/internal/api/router_integration_test.go
+++ b/internal/api/router_integration_test.go
@@ -1551,15 +1551,22 @@ func TestWebSocketSendsInitialState(t *testing.T) {
 		return typeVal, payload
 	}
 
-	msgType, _ := readMsg()
-	if msgType != "welcome" {
-		t.Fatalf("expected welcome message, got %q", msgType)
+	// Heartbeat pings interleave freely with the connect sequence, so wait
+	// for each expected type instead of asserting strict message order.
+	readType := func(expected string) map[string]any {
+		t.Helper()
+		for i := 0; i < 6; i++ {
+			msgType, payload := readMsg()
+			if msgType == expected {
+				return payload
+			}
+		}
+		t.Fatalf("timed out waiting for %q websocket message", expected)
+		return nil
 	}
 
-	msgType, payload := readMsg()
-	if msgType != "initialState" {
-		t.Fatalf("expected initialState message, got %q", msgType)
-	}
+	readType("welcome")
+	payload := readType("initialState")
 
 	legacyKeys := []string{
 		"nodes",
@@ -1579,16 +1586,7 @@ func TestWebSocketSendsInitialState(t *testing.T) {
 	state := srv.monitor.BuildFrontendState()
 	srv.hub.BroadcastState(state)
 
-	deadline := time.Now().Add(15 * time.Second)
-	for {
-		msgType, payload = readMsg()
-		if msgType == "rawData" {
-			break
-		}
-		if time.Now().After(deadline) {
-			t.Fatalf("expected rawData broadcast before deadline, got %q", msgType)
-		}
-	}
+	payload = readType("rawData")
 	for _, key := range legacyKeys {
 		if _, ok := payload[key]; ok {
 			t.Fatalf("broadcast payload should not include legacy key %q", key)