mirror of
https://github.com/rocky-linux/os-autoinst-distri-rocky.git
synced 2024-11-26 06:56:26 +00:00
Don't expect GDM when doing GNOME no-user install on F28+
GNOME now transitions straight from the g-i-s 'user creation' mode to a logged-in desktop. Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
parent
e3887c5a83
commit
5a48086e61
@ -25,32 +25,36 @@ sub run {
|
|||||||
}
|
}
|
||||||
$wait_time = 300;
|
$wait_time = 300;
|
||||||
}
|
}
|
||||||
# Wait for the login screen
|
# Wait for the login screen, unless we're doing an > 28 GNOME no
|
||||||
boot_to_login_screen(timeout => $wait_time);
|
# user install, which transitions straight from g-i-s to logged-in
|
||||||
# if USER_LOGIN is set to string 'false', we're done here
|
# desktop
|
||||||
return if (get_var("USER_LOGIN") eq "false");
|
unless (get_var("DESKTOP") eq 'gnome' && ($version > 28 || $version eq "Rawhide") && get_var("INSTALL_NO_USER")) {
|
||||||
|
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...
|
# 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 (get_var("DESKTOP") eq 'gnome') {
|
||||||
# we have to hit enter to get the password dialog
|
# 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";
|
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";
|
|
||||||
|
|
||||||
# Handle initial-setup, for GNOME, unless START_AFTER_TEST
|
# Handle initial-setup, for GNOME, 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
|
||||||
|
Loading…
Reference in New Issue
Block a user