Update WebSocket tests for new log format, dependency

Author: haoruizhou

universal-telemetry-software/requirements.txt

@@ -9,6 +9,7 @@ cantools>=39.4.0
 # Test dependencies
 pytest>=7.4.0
 pytest-asyncio>=0.21.0
+pytest-timeout>=2.1.0
 requests>=2.31.0
 
 PyGObject

universal-telemetry-software/tests/test_integration.py

@@ -369,13 +369,13 @@ def handle_error(error):
                     logger.info(f"  {msg}")
 
                 # Check for WebSocket connection
-                connection_logs = [msg for msg in console_messages if "WebSocket connected" in msg]
+                connection_logs = [msg for msg in console_messages if "[WebSocket] Connected" in msg]
                 assert len(connection_logs) > 0, \
                     f"WebSocket connection not established. Errors: {page_errors}. Console: {console_messages[:15]}"
                 logger.info("✓ Pecan established WebSocket connection")
-                
+
                 # Check for data reception (should see at least first message)
-                data_logs = [msg for msg in console_messages if "Received WebSocket message #" in msg]
+                data_logs = [msg for msg in console_messages if "[WebSocket] Message #" in msg]
                 assert len(data_logs) > 0, \
                     f"No WebSocket messages received. Console: {console_messages[:15]}"
                 logger.info(f"✓ Pecan received {len(data_logs)} WebSocket messages")

universal-telemetry-software/tests/test_websocket_v2.py

@@ -62,7 +62,16 @@ async def test_ping_returns_pong(self):
             await ws.connect()
             ts = int(time.time() * 1000)
             await ws.send_message({"type": "ping", "timestamp": ts})
-            msg = await ws.receive_message(timeout=5)
+
+            # Server may send CAN batch frames before the pong — skip non-dict messages
+            msg = None
+            for _ in range(10):
+                candidate = await ws.receive_message(timeout=5)
+                if candidate is None:
+                    break
+                if isinstance(candidate, dict) and candidate.get("type") == "pong":
+                    msg = candidate
+                    break
 
             assert msg is not None, "No pong response received"
             assert msg["type"] == "pong"