From db3451352434dcc933f33405136bff447b99c85c Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Thu, 5 May 2016 23:20:02 -0700 Subject: [PATCH] ok, still fixing the g-i-s loop...but I know what was wrong now the first param to assert_and_click is *the button number*, not the wait time. So as soon as I set that for anything it was not gonna work. So going back to the original approach but fixing that, hope this works. --- tests/_graphical_wait_login.pm | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/tests/_graphical_wait_login.pm b/tests/_graphical_wait_login.pm index d29dafcb..51103ba9 100644 --- a/tests/_graphical_wait_login.pm +++ b/tests/_graphical_wait_login.pm @@ -29,21 +29,16 @@ sub run { # is set in which case it will have been done already if (get_var("DESKTOP") eq 'gnome' && !get_var("START_AFTER_TEST")) { assert_screen "next_button", 60; - # this wizard is kind of annoying, sometimes clicks just - # don't work. wait_still_screen and wait_screen_change - # don't help much either. let's use a loop and just click - # until we reach 'skip_button'. if we go through the loop - # 20 times, give up. - for my $n (1..20) { + for my $n (1..3) { + # click 'Next' three times, moving the mouse to avoid + # highlight problems, sleeping to give it time to get + # to the next screen between clicks mouse_set(100, 100); - assert_and_click "next_button"; - mouse_set(100, 100); - last if (check_screen "skip_button", 5); + wait_screen_change { assert_and_click "next_button"; }; } # click 'Skip' one time - sleep 5; - assert_and_click "skip_button", 5; - wait_still_screen 5; + mouse_set(100,100); + wait_screen_change { assert_and_click "skip_button"; }; send_key "ret"; # wait for the stupid 'help' screen to show and kill it assert_screen "getting_started";