Revert workaround for RHBZ#1553935 now it's fixed

We don't need this any more, so let's remove the complication.
This commit is contained in:
Adam Williamson 2018-06-18 10:59:38 -07:00
parent b1140dafde
commit faef957bac
3 changed files with 2 additions and 28 deletions

View File

@ -1,15 +0,0 @@
{
"tags": [
"workstation_install_running"
],
"area": [
{
"xpos": 93,
"ypos": 5,
"width": 19,
"height": 19,
"type": "match"
}
],
"properties": []
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 112 KiB

View File

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