Add CI environment optimizations to improve test stability …

.github/workflows/test.yml

@@ -19,6 +19,7 @@ jobs:
         run: |
           docker run --rm \
             --volume ${{ github.workspace }}:/${{ github.event.repository.name }} \
+            -e CI=true \
             debian:${{ matrix.debian }} \
             /bin/bash -c " \
               apt-get update && \
@@ -32,7 +33,7 @@ jobs:
               # Install from our source until they release their latest version to PyPI
               pip3 install bluez-peripheral==0.1.8 --extra-index-url=https://packagecloud.io/pi-top/pypi/pypi/simple && \
               pip3 install .[test] && \
-              pytest -v --cov=further_link && \
+              CI=true pytest -v --cov=further_link && \
               coverage xml \
             "
 

further_link/runner/process_handler.py

@@ -249,9 +249,10 @@
         # wait a little for the io tasks to complete to let them send
         # output produced right before the process stopped
         # but cancel them after a timeout if they don't stop themselves
-        await timeout(output_tasks, 1)
+        cleanup_timeout = float(os.environ.get("FURTHER_LINK_CLEANUP_TIMEOUT", "1"))
+        await timeout(output_tasks, cleanup_timeout)
         if hasattr(self, "ipc_tasks"):
-            await timeout(self.ipc_tasks, 0.1)
+            await timeout(self.ipc_tasks, cleanup_timeout * 0.1)
 
         await self._handle_process_end()
 

tests/conftest.py

@@ -15,6 +15,11 @@
 os.environ["FURTHER_LINK_WORK_DIR"] = WORKING_DIRECTORY
 os.environ["FURTHER_LINK_MINISCREEN_PROJECTS_DIR"] = PROJECTS_DIR
 
+# Set shorter timeouts for CI environments to prevent hanging tests
+if os.environ.get("CI") == "true":
+    os.environ["FURTHER_LINK_CLEANUP_TIMEOUT"] = "0.2"  # 200ms instead of default 1s
+    os.environ["FURTHER_LINK_TEST_TIMEOUT"] = "2"  # 2s timeout for test operations
+
 
 @pytest.fixture(autouse=True)
 def create_working_directory():

tests/e2e/helpers.py

@@ -1,5 +1,6 @@
 import asyncio
 import json
+import os
 from concurrent.futures import TimeoutError
 from time import time
 
@@ -39,10 +40,29 @@ async def receive_data(ws, channel, data_key=None, data_value=None, process=""):
 async def wait_for_data(
     ws, channel, data_key=None, data_value=None, timeout=0, process=""
 ):
+    # Get timeout from environment if in CI mode
+    if os.environ.get("CI") == "true" and timeout == 0:
+        try:
+            timeout = int(os.environ.get("FURTHER_LINK_TEST_TIMEOUT", "2"))
+        except (ValueError, TypeError):
+            timeout = 2
+
     start_time = round(time())
+    max_time = timeout if timeout > 0 else 120  # Set a maximum timeout for safety
+
     while timeout <= 0 or (round(time()) - start_time) <= timeout:
+        # Prevent tests from hanging indefinitely
+        if round(time()) - start_time > max_time:
+            raise TimeoutError(f"Test operation timed out after {max_time}s")
+
         try:
-            message = await ws.receive()
+            # Set a reasonable receive timeout to prevent indefinite hangs
+            receive_timeout = min(0.5, max_time - (round(time()) - start_time))
+            if receive_timeout <= 0:
+                raise TimeoutError("Receive timeout expired")
+
+            # Use wait_for to prevent indefinite blocking
+            message = await asyncio.wait_for(ws.receive(), timeout=receive_timeout)
             m_type, m_data, m_process, m_client = parse_message(message.data)
 
             assert m_process == process, f"{m_process} != {process}"
@@ -71,7 +91,7 @@ async def wait_for_data(
             return await receive_data(ws, channel, data_key, remaining_data, process)
         except (TimeoutError, asyncio.TimeoutError):
             continue
-    raise TimeoutError
+    raise TimeoutError(f"Test operation timed out after {timeout}s")
 
 
 async def send_formatted_bluetooth_message(