srbala/os-autoinst-distri-fedora
1
0
Fork 0
mirror of https://pagure.io/fedora-qa/os-autoinst-distri-fedora.git synced 2024-11-12 09:54:21 +00:00
Code Issues Releases Activity

Workaround RHBZ#2120433 - try login again if it fails

Browse Source 
Also stop re-doing get_var("DESKTOP") because that's dumb. This
should only, at worst, make things slower if unexpected things
happen - it shouldn't cause failures that wouldn't happen anyway.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2022-08-22 17:22:26 -07:00
parent ba6a2c508a
commit 5f6232a5a5
1 changed files with 34 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
tests/_graphical_wait_login.pm
View File

@ -3,10 +3,28 @@ use strict;
use testapi; use testapi;
use utils; use utils;
sub _enter_password {
my $password = shift;
if (get_var("SWITCHED_LAYOUT")) {
# see _do_install_and_reboot; when layout is switched
# user password is doubled to contain both US and native
# chars
desktop_switch_layout 'ascii';
type_very_safely $password;
desktop_switch_layout 'native';
type_very_safely $password;
}
else {
type_very_safely $password;
}
send_key "ret";
}
sub run { sub run {
my $self = shift; my $self = shift;
my $password = get_var("USER_PASSWORD", "weakpassword"); my $password = get_var("USER_PASSWORD", "weakpassword");
my $version = get_var("VERSION"); my $version = get_var("VERSION");
my $desktop = get_var("DESKTOP");
# If KICKSTART is set, then the wait_time needs to consider the # If KICKSTART is set, then the wait_time needs to consider the
# install time. if UPGRADE, we have to wait for the entire upgrade # install time. if UPGRADE, we have to wait for the entire upgrade
# unless ENCRYPT_PASSWORD is set (in which case the postinstall # unless ENCRYPT_PASSWORD is set (in which case the postinstall
@ -23,7 +41,7 @@ sub run {
# Handle pre-login initial setup if we're doing INSTALL_NO_USER # Handle pre-login initial setup if we're doing INSTALL_NO_USER
if (get_var("INSTALL_NO_USER") && !get_var("_setup_done")) { if (get_var("INSTALL_NO_USER") && !get_var("_setup_done")) {
if (get_var("DESKTOP") eq 'gnome') { if ($desktop eq 'gnome') {
gnome_initial_setup(prelogin => 1, timeout => $wait_time); gnome_initial_setup(prelogin => 1, timeout => $wait_time);
} }
else { else {
@ -38,14 +56,14 @@ sub run {
# Wait for the login screen, unless we're doing a GNOME no user # Wait for the login screen, unless we're doing a GNOME no user
# install, which transitions straight from g-i-s to logged-in # install, which transitions straight from g-i-s to logged-in
# desktop # desktop
unless (get_var("DESKTOP") eq 'gnome' && get_var("INSTALL_NO_USER")) { unless ($desktop eq 'gnome' && get_var("INSTALL_NO_USER")) {
boot_to_login_screen(timeout => $wait_time); boot_to_login_screen(timeout => $wait_time);
# if USER_LOGIN is set to string 'false', we're done here # if USER_LOGIN is set to string 'false', we're done here
return if (get_var("USER_LOGIN") eq "false"); return if (get_var("USER_LOGIN") eq "false");
# GDM 3.24.1 dumps a cursor in the middle of the screen here... # GDM 3.24.1 dumps a cursor in the middle of the screen here...
mouse_hide; mouse_hide;
if (get_var("DESKTOP") eq 'gnome') { if ($desktop eq 'gnome') {
# we have to hit enter to get the password dialog, and it # we have to hit enter to get the password dialog, and it
# doesn't always work for some reason so just try it three # doesn't always work for some reason so just try it three
# times # times
@ -55,32 +73,31 @@ sub run {
# seems like we often double-type on aarch64 if we start right # seems like we often double-type on aarch64 if we start right
# away # away
wait_still_screen 5; wait_still_screen 5;
if (get_var("SWITCHED_LAYOUT")) { _enter_password($password);
# see _do_install_and_reboot; when layout is switched # FIXME: workaround RHBZ#2120433 - catch if the login failed
# user password is doubled to contain both US and native # and retry if so
# chars my $relnum = get_release_number;
desktop_switch_layout 'ascii'; if ($relnum > 37 && $desktop eq 'gnome') {
type_very_safely $password; unless (check_screen ["getting_started", "apps_menu_button"], 45) {
desktop_switch_layout 'native'; if (check_screen "graphical_login_input") {
type_very_safely $password; record_soft_failure "Login failed, probably #2120433 - retrying";
_enter_password($password);
}
}
} }
else {
type_very_safely $password;
}
send_key "ret";
} }
# For GNOME, handle initial-setup or welcome tour, unless START_AFTER_TEST # For GNOME, handle initial-setup or welcome tour, unless START_AFTER_TEST
# is set in which case it will have been done already. Always # is set in which case it will have been done already. Always
# do it if ADVISORY_OR_TASK is set, as for the update testing flow, # do it if ADVISORY_OR_TASK is set, as for the update testing flow,
# START_AFTER_TEST is set but a no-op and this hasn't happened # START_AFTER_TEST is set but a no-op and this hasn't happened
if (get_var("DESKTOP") eq 'gnome' && (get_var("ADVISORY_OR_TASK") || !get_var("START_AFTER_TEST"))) { if ($desktop eq 'gnome' && (get_var("ADVISORY_OR_TASK") || !get_var("START_AFTER_TEST"))) {
# as this test gets loaded twice on the ADVISORY_OR_TASK flow, and # as this test gets loaded twice on the ADVISORY_OR_TASK flow, and
# we might be on the INSTALL_NO_USER flow, check whether # we might be on the INSTALL_NO_USER flow, check whether
# this happened already # this happened already
handle_welcome_screen unless (get_var("_welcome_done")); handle_welcome_screen unless (get_var("_welcome_done"));
} }
if (get_var("DESKTOP") eq 'gnome' && get_var("INSTALL_NO_USER")) { if ($desktop eq 'gnome' && get_var("INSTALL_NO_USER")) {
# handle welcome screen if we didn't do it above (holy flow # handle welcome screen if we didn't do it above (holy flow
# control, Batman!) # control, Batman!)
handle_welcome_screen unless (get_var("_welcome_done")); handle_welcome_screen unless (get_var("_welcome_done"));