From d6de57c6de9c5ae5105ba279099c160a4ad73188 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Mon, 17 Dec 2018 14:10:58 -0800 Subject: [PATCH] Drop RHBZ#1618928 workaround Bug was fixed back in August. Signed-off-by: Adam Williamson --- lib/utils.pm | 43 +++----------------------------------- tests/_boot_to_anaconda.pm | 2 +- 2 files changed, 4 insertions(+), 41 deletions(-) diff --git a/lib/utils.pm b/lib/utils.pm index bcc280e5..cdd553a6 100644 --- a/lib/utils.pm +++ b/lib/utils.pm @@ -46,40 +46,6 @@ sub desktop_vt { send_key "ctrl-alt-f${tty}"; } -sub _grub_error_loop { - # this is a loop used in a few different places to work around - # RHBZ#1618928, a bug where grub displays some error or debug - # messages in a pager on boot. We match on *either* the tag - # we're really looking for ('good') *or* the tag for this pager, - # then if we matched the pager, we loop (a maximum 10 times) - # pressing 'space' as long as we still match on the pager. As - # soon as we match the needle we were actually looking for, we - # escape. timeout is the time we should wait for the *first* - # match, timeoutcap is a cap on timeout for the *subsequent* - # matches; several of the users need this behaviour. - my %args = ( - good => "someneedle", - timeout => 300, - timeoutcap => 60, - @_ - ); - my $timeout = $args{timeout}; - assert_screen [$args{good}, "grub_error_page"], $timeout; - my $loopcount = 10; - while (match_has_tag "grub_error_page") { - $timeout = $args{timeoutcap} if ($timeout > $args{timeoutcap}); - send_key "spc"; - $loopcount -= 1; - if ($loopcount == 0) { - # let's not loop forever... - assert_screen $args{good}, $timeout; - } - else { - assert_screen [$args{good}, "grub_error_page"], $timeout; - } - } -} - # Wait for login screen to appear. Handle the annoying GPU buffer # problem where we see a stale copy of the login screen from the # previous boot. Will suffer a ~30 second delay if there's a chance @@ -95,10 +61,7 @@ sub boot_to_login_screen { sleep 5; $count -= 1; } - # we cap the timeouts inside this loop at 300 as it should always - # be the right number - if this is a post-upgrade case or the - # kickstart install case, that already finished by now - _grub_error_loop(good=>"login_screen", timeout=>$args{timeout}, timeoutcap=>300); + assert_screen "login_screen", $args{timeout}; if (match_has_tag "graphical_login") { wait_still_screen 10, 30; assert_screen "login_screen"; @@ -260,7 +223,7 @@ sub do_bootloader { # sure we actually did a UEFI boot my $boottag = "bootloader_bios"; $boottag = "bootloader_uefi" if ($args{uefi}); - _grub_error_loop(good=>$boottag, timeout=>$args{timeout}, timeoutcap=>30); + assert_screen $boottag, $args{timeout}; if ($args{mutex}) { # cancel countdown send_key "left"; @@ -309,7 +272,7 @@ sub do_bootloader { sub boot_decrypt { # decrypt storage during boot; arg is timeout (in seconds) my $timeout = shift || 60; - _grub_error_loop(good=>"boot_enter_passphrase", timeout=>$timeout, timeoutcap=>60); + assert_screen "boot_enter_passphrase", $timeout; type_string get_var("ENCRYPT_PASSWORD"); send_key "ret"; } diff --git a/tests/_boot_to_anaconda.pm b/tests/_boot_to_anaconda.pm index 829a22c5..360adb0f 100644 --- a/tests/_boot_to_anaconda.pm +++ b/tests/_boot_to_anaconda.pm @@ -39,7 +39,7 @@ sub run { # wait for the bootloader *here* - in a test that inherits from # anacondatest - so that if something goes wrong during install, # we get anaconda logs - assert_screen ["bootloader", "grub_error_page"], 1800; + assert_screen "bootloader", 1800; } else { if (get_var("ANACONDA_TEXT")) {