fix: tests

[no changelog]
This commit is contained in:
Ioan Bizău
2026-02-04 15:14:10 +01:00
committed by Ioan Bizău
parent 2ecf2d902b
commit e9f2c644be
2 changed files with 48 additions and 17 deletions

View File

@@ -997,6 +997,18 @@ class UnexpectedMenuError(Exception):
return f"Layout content: {self.layout_content}"
def _step(
gen: t.Generator[None, t.Any, None] | None,
) -> t.Generator[None, t.Any, None] | None:
if gen is not None:
try:
gen.send(None)
return gen
except StopIteration:
pass
return None
class DebugUI:
INPUT_FLOW_DONE = object()
@@ -1021,7 +1033,9 @@ class DebugUI:
else:
self._paginate_and_confirm(br.pages)
def _visit_vertical_menu(self, menu_layout: LayoutContent) -> None:
def _visit_vertical_menu(
self, menu_layout: LayoutContent, gen: t.Generator[None, t.Any, None] | None
) -> None:
assert self.debuglink.layout_type in (LayoutType.Delizia, LayoutType.Eckhart)
assert "VerticalMenu" in menu_layout.all_components()
@@ -1031,20 +1045,28 @@ class DebugUI:
menu_buttons = menu_layout.find_unique_value_by_key(
key="buttons", default=None, only_type=list
)
if gen:
next(gen)
for menu_button, item_button in zip(menu_buttons, item_buttons):
if menu_button.get("skip_test_visit"):
continue # visit only idempotent entries (e.g. for showing more information)
self.debuglink.click(item_button)
gen = _step(gen)
self.debuglink.click(close_button)
assert gen is None
def _visit_scrolled_vertical_menu(self, menu_layout: LayoutContent) -> None:
def _visit_scrolled_vertical_menu(
self, menu_layout: LayoutContent, gen: t.Generator[None, t.Any, None] | None
) -> None:
assert self.debuglink.layout_type is LayoutType.Delizia
assert "ScrolledVerticalMenu" in menu_layout.all_components()
item_buttons = self.debuglink.screen_buttons.vertical_menu_items()
close_button = self.debuglink.screen_buttons.menu()
_prev, next = self.debuglink.screen_buttons.vertical_menu_prev_next()
_prev, next_button = self.debuglink.screen_buttons.vertical_menu_prev_next()
if gen:
next(gen)
while True:
menu_items = menu_layout.find_unique_value_by_key(
key="menu_items", default=None, only_type=dict
@@ -1053,14 +1075,18 @@ class DebugUI:
if "cancel" in menu_item:
continue # don't click cancel
self.debuglink.click(item_button)
gen = _step(gen)
self.debuglink.click(close_button)
if not menu_items["has_next"]:
break
self.debuglink.click(next)
self.debuglink.click(next_button)
menu_layout = self.debuglink.read_layout()
assert "ScrolledVerticalMenu" in menu_layout.all_components()
assert gen is None
def visit_menu_items(self) -> LayoutContent:
def visit_menu_items(
self, gen: t.Generator[None, t.Any, None] | None = None
) -> LayoutContent:
layout = self.debuglink.read_layout()
if (
not layout.has_menu()
@@ -1082,18 +1108,19 @@ class DebugUI:
if self.debuglink.layout_type is LayoutType.Eckhart:
menu_layout = self.debuglink.read_layout()
if "VerticalMenu" in menu_layout.all_components():
self._visit_vertical_menu(menu_layout)
self._visit_vertical_menu(menu_layout, gen)
else:
raise UnexpectedMenuError(menu_layout.json_str)
elif self.debuglink.layout_type is LayoutType.Delizia:
menu_layout = self.debuglink.read_layout()
if "ScrolledVerticalMenu" in menu_layout.all_components():
self._visit_scrolled_vertical_menu(menu_layout)
self._visit_scrolled_vertical_menu(menu_layout, gen)
elif "VerticalMenu" in menu_layout.all_components():
self._visit_vertical_menu(menu_layout)
self._visit_vertical_menu(menu_layout, gen)
else:
raise UnexpectedMenuError(menu_layout.json_str)
elif self.debuglink.layout_type is LayoutType.Caesar:
assert gen is None, "Menu visiting callback not yet supported on Caesar"
menu_items_count = self.debuglink.read_layout().page_count()
for _ in range(menu_items_count):
self.debuglink.press_middle()