From 01fd92cb3415c50765ec65eb76afaf81a57c1c53 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Mon, 17 Dec 2018 14:18:05 -0800 Subject: [PATCH] Drop #1444225 workaround The bug never got explicitly addressed, but it's very old and anaconda has been substantially changed since. The workaround sometimes triggers erroneously now (because the icon sometimes goes black while the spoke is still in 'Checking storage configuration...' state), which is awkward. I can't be 100% sure the bug doesn't sometimes still happen, but if it does, we'll notice fairly soon, and we can tweak this and put it back. Signed-off-by: Adam Williamson --- tests/_do_install_and_reboot.pm | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/tests/_do_install_and_reboot.pm b/tests/_do_install_and_reboot.pm index b3fcb11e..5038cd0f 100644 --- a/tests/_do_install_and_reboot.pm +++ b/tests/_do_install_and_reboot.pm @@ -6,20 +6,7 @@ use utils; sub run { my $self = shift; # Begin installation - # Deal with RHBZ #1444225: if INSTALLATION DESTINATION is showing - # incomplete (which it never should at this point), take a quick - # trip through it to fix it - foreach my $i (1..150) { - last if (check_screen "anaconda_main_hub_begin_installation", 1); - if (check_screen "anaconda_main_hub_install_destination_warning", 1) { - record_soft_failure "RHBZ #1444225 (INSTALLATION DESTINATION bug)"; - assert_and_click "anaconda_main_hub_install_destination"; - wait_still_screen 2; - assert_and_click "anaconda_spoke_done"; - # if this is an encrypted install, re-confirm passphrase - assert_and_click "anaconda_install_destination_save_passphrase" if (get_var("ENCRYPT_PASSWORD")); - } - } + assert_screen "anaconda_main_hub_begin_installation", 300; # Sometimes, the 'slide in from the top' animation messes with # this - by the time we click the button isn't where it was any # more. So wait for screen to stop moving before we click.