Improve tests/test_graphical_imu_calibration.py stability

ThomasFarstrike · ThomasFarstrike · commit dceea68b1a43 · 2026-05-26T19:15:44.000+02:00
diff --git a/internal_filesystem/lib/mpos/__init__.py b/internal_filesystem/lib/mpos/__init__.py
@@ -42,7 +42,7 @@
     get_all_widgets_with_text, find_setting_value_label, get_setting_value_text,
     verify_setting_value_text, find_dropdown_widget, get_dropdown_options,
     find_dropdown_option_index, select_dropdown_option_by_text,
-    get_all_children, simulate_long_press
+    get_all_children, simulate_long_press, wait_for_text, wait_for_widget
 )
 
 # UI utility functions
@@ -103,7 +103,7 @@
     "get_all_widgets_with_text", "find_setting_value_label", "get_setting_value_text",
     "verify_setting_value_text", "find_dropdown_widget", "get_dropdown_options",
     "find_dropdown_option_index", "select_dropdown_option_by_text",
-    "get_all_children", "simulate_long_press",
+    "get_all_children", "simulate_long_press", "wait_for_text", "wait_for_widget",
     # Submodules
     "ui", "config", "net", "content", "time", "sensor_manager",
     "camera_manager", "sdcard", "audio", "hardware",
diff --git a/internal_filesystem/lib/mpos/ui/testing.py b/internal_filesystem/lib/mpos/ui/testing.py
@@ -1702,3 +1702,60 @@ def get_all_children(parent):
 
 def simulate_long_press(x, y, duration_ms=1000):
     simulate_click(x, y, press_duration_ms=duration_ms)
+
+
+def wait_for_text(text, timeout=10, interval=0.1):
+    """
+    Wait for text to appear on screen, polling periodically.
+
+    More robust than wait_for_render(N) because it actually checks
+    for the desired condition instead of waiting a fixed amount of time.
+    Handles slow CI machines gracefully &mdash; returns as soon as text appears.
+
+    Args:
+        text: Text to search for (substring match via verify_text_present)
+        timeout: Maximum time to wait in seconds (default: 10)
+        interval: Time between checks in seconds (default: 0.1)
+
+    Returns:
+        True if text found within timeout, False otherwise
+    """
+    start = time.time()
+    while time.time() - start < timeout:
+        if verify_text_present(lv.screen_active(), text):
+            return True
+        wait_for_render(5)
+        time.sleep(interval)
+    print(f"wait_for_text: '{text}' not found after {timeout}s")
+    return False
+
+
+def wait_for_widget(find_func, timeout=10, interval=0.1):
+    """
+    Wait for a widget condition, polling periodically.
+
+    find_func should be a callable that returns a widget or truthy value
+    when the condition is met, and None/falsy otherwise.  For example::
+
+        btn = wait_for_widget(
+            lambda: find_button_with_text(lv.screen_active(), "Submit"),
+            timeout=5
+        )
+
+    Args:
+        find_func: Callable that returns a widget or truthy value
+        timeout: Maximum time to wait in seconds (default: 10)
+        interval: Time between checks in seconds (default: 0.1)
+
+    Returns:
+        The result of find_func if found within timeout, None otherwise
+    """
+    start = time.time()
+    while time.time() - start < timeout:
+        result = find_func()
+        if result:
+            return result
+        wait_for_render(5)
+        time.sleep(interval)
+    print(f"wait_for_widget: condition not met after {timeout}s")
+    return None
diff --git a/tests/test_graphical_imu_calibration.py b/tests/test_graphical_imu_calibration.py
@@ -12,17 +12,12 @@
 import unittest
 import lvgl as lv
 import mpos.ui
-import time
 import sys
 from mpos import (
-    wait_for_render,
-    find_label_with_text,
+    wait_for_text,
     verify_text_present,
     print_screen_labels,
-    simulate_click,
-    get_widget_coords,
     find_button_with_text,
-    find_text_on_screen,
     AppManager
 )
 
@@ -36,17 +31,10 @@ def _start_activity_from_settings_assets(self, filename, classname):
         cwd = f"builtin/apps/{app_fullname}/assets/"
         result = AppManager.execute_script(entrypoint, classname, cwd, app_fullname=app_fullname)
         self.assertTrue(result, f"Failed to start {classname} from {entrypoint}")
-        wait_for_render(iterations=60)
 
     def tearDown(self):
         """Clean up after test."""
-        # Navigate back to launcher
-        try:
-            for _ in range(3):  # May need multiple backs
-                mpos.ui.back_screen()
-                wait_for_render(10)
-        except:
-            pass
+        mpos.ui.back_screen()
 
     def test_check_calibration_activity_loads(self):
         """Test that CheckIMUCalibrationActivity loads and displays."""
@@ -55,10 +43,13 @@ def test_check_calibration_activity_loads(self):
         # Navigate directly to activity to avoid flaky settings clicks
         self._start_activity_from_settings_assets("check_imu_calibration.py", "CheckIMUCalibrationActivity")
 
+        # Wait for activity UI to render (polling, not fixed &mdash; handles slow CI)
+        self.assertTrue(wait_for_text("Quality", timeout=10),
+                        "CheckIMUCalibrationActivity: 'Quality' label not found within timeout")
+
         # Verify key elements are present
         screen = lv.screen_active()
         print_screen_labels(screen)
-        self.assertTrue(verify_text_present(screen, "Quality"), "Quality label not found")
         self.assertTrue(verify_text_present(screen, "Accel."), "Accel. label not found")
         self.assertTrue(verify_text_present(screen, "Gyro"), "Gyro label not found")
 
@@ -71,31 +62,29 @@ def test_calibrate_activity_flow(self):
         # Navigate directly to activity to avoid flaky settings clicks
         self._start_activity_from_settings_assets("calibrate_imu.py", "CalibrateIMUActivity")
 
-        # Verify activity loaded and shows instructions
+        # Wait for activity UI to render (polling, not fixed)
+        self.assertTrue(wait_for_text("IMU Calibration", timeout=10),
+                        "CalibrateIMUActivity title not found within timeout")
         screen = lv.screen_active()
         print_screen_labels(screen)
-        self.assertTrue(verify_text_present(screen, "IMU Calibration"),
-                       "CalibrateIMUActivity title not found")
         self.assertTrue(verify_text_present(screen, "Place device on flat"),
                        "Instructions not shown")
 
         # Click "Calibrate Now" button to start calibration
         calibrate_btn = find_button_with_text(screen, "Calibrate Now")
         self.assertIsNotNone(calibrate_btn, "Could not find 'Calibrate Now' button")
         calibrate_btn.send_event(lv.EVENT.CLICKED, None)
-        wait_for_render(25)
 
-        # Wait for calibration to complete (mock takes ~3 seconds)
-        time.sleep(4)
-        wait_for_render(50)
+        # Wait for calibration to complete &mdash; poll for the success message
+        # instead of fixed sleep (handles slow/fast CI equally well)
+        self.assertTrue(
+            wait_for_text("Calibration successful!", timeout=15),
+            "Calibration completion message not found within timeout"
+        )
 
-        # Verify calibration completed
+        # Verify offsets are shown
         screen = lv.screen_active()
         print_screen_labels(screen)
-        self.assertTrue(verify_text_present(screen, "Calibration successful!"),
-                       "Calibration completion message not found")
-
-        # Verify offsets are shown
         self.assertTrue(verify_text_present(screen, "Accel offsets") or
                        verify_text_present(screen, "offsets"),
                        "Calibration offsets not shown")
@@ -109,6 +98,10 @@ def test_navigation_from_check_to_calibrate(self):
         # Navigate directly to Check activity
         self._start_activity_from_settings_assets("check_imu_calibration.py", "CheckIMUCalibrationActivity")
 
+        # Wait for Check activity to render
+        self.assertTrue(wait_for_text("Quality", timeout=10),
+                        "CheckIMUCalibrationActivity: 'Quality' label not found")
+
         # Click "Calibrate" button to navigate to Calibrate activity
         screen = lv.screen_active()
         calibrate_btn = find_button_with_text(screen, "Calibrate")
@@ -121,19 +114,20 @@ def test_navigation_from_check_to_calibrate(self):
             added_path = True
         try:
             calibrate_btn.send_event(lv.EVENT.CLICKED, None)
-            wait_for_render(60)
         finally:
             if added_path:
                 try:
                     sys.path.remove(assets_path)
                 except ValueError:
                     pass
 
-        # Verify CalibrateIMUActivity loaded
+        # Wait for CalibrateIMUActivity to load (polling, not fixed)
+        self.assertTrue(
+            wait_for_text("Calibrate Now", timeout=10),
+            "Did not navigate to CalibrateIMUActivity within timeout"
+        )
         screen = lv.screen_active()
         print_screen_labels(screen)
-        self.assertTrue(verify_text_present(screen, "Calibrate Now"),
-                       "Did not navigate to CalibrateIMUActivity")
         self.assertTrue(verify_text_present(screen, "Place device on flat"),
                        "CalibrateIMUActivity instructions not shown")
 
