testing/os-autoinst-distri-rocky-migrated
10
0
Fork 0
Code Issues 12 Pull Requests 1 Packages Projects Releases Wiki Activity

Simplify _graphical_wait_login by dropping a huge conditional

Browse Source 
If USER_LOGIN is false we can just return; when we reach the
login screen. We don't need a huge conditional when we don't do
anything *after* it, in the false case.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2018-09-06 15:01:08 -07:00
parent 26c4171e5c
commit 64c5070b06
1 changed files with 68 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

136
tests/_graphical_wait_login.pm
View File

@ -27,86 +27,86 @@ sub run {
}
# Wait for the login screen
boot_to_login_screen(timeout => $wait_time);
# if USER_LOGIN is set to string 'false', we're done here
return if (get_var("USER_LOGIN") eq "false");
# GDM 3.24.1 dumps a cursor in the middle of the screen here...
mouse_hide;
# do user login unless USER_LOGIN is set to string 'false'
unless (get_var("USER_LOGIN") eq "false") {
if (get_var("DESKTOP") eq 'gnome') {
# we have to hit enter to get the password dialog
if (get_var("DESKTOP") eq 'gnome') {
# we have to hit enter to get the password dialog
send_key "ret";
}
assert_screen "graphical_login_input";
my $password = get_var("USER_PASSWORD", "weakpassword");
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";
# An auth request for update check appears on FAW 28 at this
# point, until
# https://pagure.io/fedora-release/pull-request/131 is merged
# and built
if (get_var("SUBVARIANT") eq 'AtomicWorkstation') {
if (check_screen "desktop_auth_required", 120) {
record_soft_failure "Update auth dialog on FAW - #1561853";
type_very_safely $password;
send_key "ret";
}
assert_screen "graphical_login_input";
my $password = get_var("USER_PASSWORD", "weakpassword");
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";
}
# An auth request for update check appears on FAW 28 at this
# point, until
# https://pagure.io/fedora-release/pull-request/131 is merged
# and built
if (get_var("SUBVARIANT") eq 'AtomicWorkstation') {
if (check_screen "desktop_auth_required", 120) {
record_soft_failure "Update auth dialog on FAW - #1561853";
type_very_safely $password;
send_key "ret";
}
}
# Handle initial-setup, for GNOME, unless START_AFTER_TEST
# is set in which case it will have been done already. Always
# do it if ADVISORY is set, as for the update testing flow,
# START_AFTER_TEST is set but a no-op and this hasn't happened
if (get_var("DESKTOP") eq 'gnome' && (get_var("ADVISORY") || !get_var("START_AFTER_TEST"))) {
# as this test gets loaded twice on the ADVISORY flow, and
# we might be on the INSTALL_NO_USER flow, check whether
# this happened already. Also, as of 2017-10 there's a bug
# in the F26 base image which stops g-i-s running at all;
# for update and upgrade testing purposes we don't want to
# fail, we just want to go ahead. So if we see the
# getting_started screen, just handle that instead.
unless (get_var("_setup_done")) {
if (get_var("ADVISORY") || get_var("UPGRADE")) {
assert_screen ["next_button", "getting_started"], 120;
if (match_has_tag("next_button")) {
gnome_initial_setup();
}
else {
send_key "alt-f4";
set_var("_setup_done", 1);
}
}
else {
# Handle initial-setup, for GNOME, unless START_AFTER_TEST
# is set in which case it will have been done already. Always
# do it if ADVISORY is set, as for the update testing flow,
# START_AFTER_TEST is set but a no-op and this hasn't happened
if (get_var("DESKTOP") eq 'gnome' && (get_var("ADVISORY") || !get_var("START_AFTER_TEST"))) {
# as this test gets loaded twice on the ADVISORY flow, and
# we might be on the INSTALL_NO_USER flow, check whether
# this happened already. Also, as of 2017-10 there's a bug
# in the F26 base image which stops g-i-s running at all;
# for update and upgrade testing purposes we don't want to
# fail, we just want to go ahead. So if we see the
# getting_started screen, just handle that instead.
unless (get_var("_setup_done")) {
if (get_var("ADVISORY") || get_var("UPGRADE")) {
assert_screen ["next_button", "getting_started"], 120;
if (match_has_tag("next_button")) {
gnome_initial_setup();
}
}
}
if (get_var("DESKTOP") eq 'gnome' && get_var("INSTALL_NO_USER")) {
# wait for the stupid 'help' screen to show and kill it
if (check_screen "getting_started", 30) {
send_key "alt-f4";
wait_still_screen 5;
else {
send_key "alt-f4";
set_var("_setup_done", 1);
}
}
else {
record_soft_failure "'getting started' missing (probably BGO#790811)";
gnome_initial_setup();
}
}
# Move the mouse somewhere it won't highlight the match areas
mouse_set(300, 800);
# KDE can take ages to start up
check_desktop_clean(tries=>40);
}
if (get_var("DESKTOP") eq 'gnome' && get_var("INSTALL_NO_USER")) {
# wait for the stupid 'help' screen to show and kill it
if (check_screen "getting_started", 30) {
send_key "alt-f4";
wait_still_screen 5;
}
else {
record_soft_failure "'getting started' missing (probably BGO#790811)";
}
}
# Move the mouse somewhere it won't highlight the match areas
mouse_set(300, 800);
# KDE can take ages to start up
check_desktop_clean(tries=>40);
}
sub test_flags {