Work around RHBZ #1553807 by checking if anaconda still running

This is the best workaround I can think of for RHBZ #1553807 -
just check (in the 60 second 'move the mouse' loop) if anaconda
is still running, based on whether its icon is in the top bar
(on Workstation live installs only, obviously).

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2018-03-09 15:22:29 -08:00
parent 71bfb896a4
commit f09330e897

View File

@ -83,15 +83,26 @@ sub run {
# move the mouse a bit # move the mouse a bit
mouse_set 100, 100; mouse_set 100, 100;
mouse_hide; mouse_hide;
# https://bugzilla.redhat.com/show_bug.cgi?id=1553935 - see
# if anaconda disappeared in the last 60 seconds...
if (get_var("LIVE") && get_var("DESKTOP" eq 'gnome')) {
last unless (check_screen "workstation_install_running", 1);
}
last if (check_screen "anaconda_install_done", $interval); last if (check_screen "anaconda_install_done", $interval);
$timeout -= $interval; $timeout -= $interval;
} }
assert_screen "anaconda_install_done"; # https://bugzilla.redhat.com/show_bug.cgi?id=1553935
unless (get_var("LIVE") && get_var("DESKTOP" eq 'gnome')) {
assert_screen "anaconda_install_done";
}
# wait for transition to complete so we don't click in the sidebar # wait for transition to complete so we don't click in the sidebar
wait_still_screen 3; wait_still_screen 3;
# for the memory check test, we *don't* want to leave # for the memory check test, we *don't* want to leave
unless (get_var("MEMCHECK")) { unless (get_var("MEMCHECK")) {
assert_and_click "anaconda_install_done"; # https://bugzilla.redhat.com/show_bug.cgi?id=1553935
unless (get_var("LIVE") && get_var("DESKTOP" eq 'gnome')) {
assert_and_click "anaconda_install_done";
}
if (get_var('LIVE')) { if (get_var('LIVE')) {
# reboot from a console, it's more reliable than the desktop # reboot from a console, it's more reliable than the desktop
# runners # runners