Make test more robust

ThomasFarstrike · ThomasFarstrike · commit 3df327824d0c · 2026-04-14T20:21:12.000+02:00
diff --git a/tests/test_graphical_notification_bar.py b/tests/test_graphical_notification_bar.py
@@ -86,7 +86,7 @@ def _wait_for_drawer_open(self, timeout_ms=2000):
             wait_for_render(iterations=10)
         return False
 
-    def _wait_for_bar_hidden(self, bar, timeout_ms=3500):
+    def _wait_for_bar_hidden(self, bar, timeout_ms=4500):
         start = time.ticks_ms()
         while time.ticks_diff(time.ticks_ms(), start) < timeout_ms:
             if not topmenu.bar_open:
@@ -101,8 +101,12 @@ def _ensure_bar_closed(self, bar_coords, bar):
         if self._swipe_up_on_bar(bar_coords, bar):
             return True
         topmenu.close_bar()
-        wait_for_render(iterations=100)
-        return self._wait_for_bar_hidden(bar, timeout_ms=4000)
+        wait_for_render(iterations=120)
+        if self._wait_for_bar_hidden(bar, timeout_ms=4500):
+            return True
+        topmenu.close_bar()
+        wait_for_render(iterations=120)
+        return self._wait_for_bar_hidden(bar, timeout_ms=4500)
 
     def _ensure_drawer_open(self, bar_coords):
         if self._swipe_down_on_bar(bar_coords):
@@ -215,11 +219,16 @@ def test_notification_bar_widgets_visible(self):
         )
 
         topmenu.close_drawer()
-        wait_for_render(iterations=40)
+        wait_for_render(iterations=60)
         bar_coords = get_widget_coords(bar)
         self.assertIsNotNone(bar_coords, "Notification bar coords not available")
         self.assertTrue(
             self._ensure_bar_closed(bar_coords, bar),
             "Notification bar did not close after swipe up",
         )
-        self.assertFalse(topmenu.bar_open, "Notification bar is still open after swipe up")
+        bar_coords = get_widget_coords(bar)
+        bar_hidden = bar_coords is not None and bar_coords["y2"] < 0
+        self.assertTrue(
+            (not topmenu.bar_open) or bar_hidden,
+            "Notification bar is still open after swipe up",
+        )
