diff --git a/needles/anaconda/install_process/workstation_install_running.json b/needles/anaconda/install_process/workstation_install_running.json deleted file mode 100644 index b154780b..00000000 --- a/needles/anaconda/install_process/workstation_install_running.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "tags": [ - "workstation_install_running" - ], - "area": [ - { - "xpos": 93, - "ypos": 5, - "width": 19, - "height": 19, - "type": "match" - } - ], - "properties": [] -} \ No newline at end of file diff --git a/needles/anaconda/install_process/workstation_install_running.png b/needles/anaconda/install_process/workstation_install_running.png deleted file mode 100644 index 44748040..00000000 Binary files a/needles/anaconda/install_process/workstation_install_running.png and /dev/null differ diff --git a/tests/_do_install_and_reboot.pm b/tests/_do_install_and_reboot.pm index 03b1e1e9..edbda056 100644 --- a/tests/_do_install_and_reboot.pm +++ b/tests/_do_install_and_reboot.pm @@ -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