another attempt to fix the damn g-i-s handler

This commit is contained in:
Adam Williamson 2016-05-05 17:44:49 -07:00
parent 79bc1e515d
commit db78559a91

View File

@ -29,22 +29,19 @@ sub run {
# is set in which case it will have been done already # is set in which case it will have been done already
if (get_var("DESKTOP") eq 'gnome' && !get_var("START_AFTER_TEST")) { if (get_var("DESKTOP") eq 'gnome' && !get_var("START_AFTER_TEST")) {
assert_screen "next_button", 60; assert_screen "next_button", 60;
# sleep a bit to let things calm down; we can't wait still # this wizard is kind of annoying, sometimes clicks just
# screen because g-i-s constantly changes and we can't wait # don't work. wait_still_screen and wait_screen_change
# idle because packagekit might be doin' stuff... # don't help much either. let's use a loop and just click
sleep 5; # until we reach 'skip_button'. if we go through the loop
assert_and_click "next_button", 10; # 20 times, give up.
for my $n (1..2) { for my $n (1..20) {
# click 'Next' twice, moving the mouse to avoid
# highlight problems, sleeping to give it time to get
# to the next screen between clicks
wait_still_screen;
mouse_set(100, 100); mouse_set(100, 100);
assert_and_click "next_button"; assert_and_click "next_button";
last if (check_screen "skip_button", 5);
} }
# click 'Skip' one time # click 'Skip' one time
mouse_set(100,100); mouse_set(100,100);
wait_screen_change { assert_and_click "skip_button"; }; wait_screen_change { assert_and_click "skip_button", 5; };
send_key "ret"; send_key "ret";
# wait for the stupid 'help' screen to show and kill it # wait for the stupid 'help' screen to show and kill it
assert_screen "getting_started"; assert_screen "getting_started";