Hi, Sorry for the noise, please ignore this patch.
Regards, SImon On Tue, 23 Sept 2025 at 12:31, Simon Glass <[email protected]> wrote: > > From: Simon Glass <[email protected]> > > The distro test for EFI in the EFI ARM app is currently flaky. > > If the test does not send an 'escape' character, then the board may boot > straight into Ubuntu. If it does, but didn't need to, then grub sits at > the command prompt. > > Handle this by pressing escape twice (which should always go to the grub > command line), then using the 'normal' command to start the menu. > > Signed-off-by: Simon Glass <[email protected]> > --- > > test/py/tests/test_distro.py | 14 +++++++++++--- > 1 file changed, 11 insertions(+), 3 deletions(-) > > diff --git a/test/py/tests/test_distro.py b/test/py/tests/test_distro.py > index cc4aa265d90..d9bc9b18648 100644 > --- a/test/py/tests/test_distro.py > +++ b/test/py/tests/test_distro.py > @@ -106,13 +106,21 @@ def test_distro_arm_app_efi(ubman): > ["Booting bootflow 'efi_media_1.bootdev.part_1' with efi"]) > > # Press Escape to force GRUB to appear, even if the silent menu was > - # enabled by a previous boot > + # enabled by a previous boot. If the menu is already set to appear, > this > + # will exit to the grub> prompt > + ubman.send('\x1b') > + > + # Press Escape again, to force it to the grub> prompt > ubman.send('\x1b') > > # Wait until we see the editor appear > with ubman.log.section('grub'): > - ubman.expect(['ESC to return previous']) > - # ubman.expect(['The highlighted entry will be executed > automatically in 29s']) > + ubman.expect(['grub>']) > + > + ubman.run_command('normal', wait_for_prompt=False) > + > + # exp = ubman.expect(['ESC to return previous', 'grub>']) > + ubman.expect(['The highlighted entry will be executed automatically > in']) > > # Press 'e' to edit the command line > ubman.log.info("Pressing 'e'") > -- > 2.43.0 > > base-commit: 136c959dd2d089710fb131956081d09b9da3bea4 > branch: labh
