From ba5a338e136c5f4deb646d3e781ac8795b44929d Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Tue, 10 Aug 2021 11:56:56 -0700 Subject: [PATCH] More tweaking the damn 'begin installation' bit `click_lastmatch` wasn't safe there, if we caught the middlle of the scroll animation. We have to assert again after waiting. Also do the same in `_do_install_and_reboot` as the same can happen. Signed-off-by: Adam Williamson --- tests/_do_install_and_reboot.pm | 3 ++- tests/anaconda_help.pm | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/_do_install_and_reboot.pm b/tests/_do_install_and_reboot.pm index a98e6a73..ddf40766 100644 --- a/tests/_do_install_and_reboot.pm +++ b/tests/_do_install_and_reboot.pm @@ -83,7 +83,8 @@ sub run { # Sometimes, the 'slide in from the top' animation messes with # this - by the time we click the button isn't where it was any # more. So wait for screen to stop moving before we click. - wait_still_screen 8; + assert_screen "anaconda_main_hub_begin_installation", 90; + wait_still_screen 5; assert_and_click "anaconda_main_hub_begin_installation"; # If we want to test identification we will do it diff --git a/tests/anaconda_help.pm b/tests/anaconda_help.pm index c28ec0f0..09f5b203 100644 --- a/tests/anaconda_help.pm +++ b/tests/anaconda_help.pm @@ -60,7 +60,7 @@ sub run { # Begin installation after waiting out animation assert_screen "anaconda_main_hub_begin_installation", 90; wait_still_screen 5; - click_lastmatch; + assert_and_click "anaconda_main_hub_begin_installation"; # Check the last Help screen check_help_on_pane("installation_progress");