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

Fix _graphical_wait_login Test died: Settings key '_welcome_done' is invalid error. #140

Merged
tcooper merged 1 commit from fix/graphical_wait_login into develop 2023-01-07 20:04:08 +00:00
Conversation 1 Commits 1 Files changed 2 +9 -9
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/utils.pm
View file

@ -685,7 +685,7 @@ sub console_initial_setup {
type_string "c\n";
wait_still_screen 7;
assert_screen "console_initial_setup_done", 30;
assert_screen "console_initial_SETUP_DONE", 30;
type_string "c\n"; # continue
}
@ -700,7 +700,7 @@ sub handle_welcome_screen {
else {
record_soft_failure "Welcome tour missing";
}
set_var("_welcome_done", 1);
set_var("_WELCOME_DONE", 1);
}
sub gnome_initial_setup {
@ -808,7 +808,7 @@ sub gnome_initial_setup {
handle_welcome_screen;
}
# don't do it again on second load
set_var("_setup_done", 1);
set_var("_SETUP_DONE", 1);
}
sub _type_user_password {

12
tests/_graphical_wait_login.pm
View file

@ -22,7 +22,7 @@ sub run {
}
# 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') {
gnome_initial_setup(prelogin=>1, timeout=>$wait_time);
}
@ -31,7 +31,7 @@ sub run {
# wait out animation
wait_still_screen 3;
assert_and_click "initialsetup_finish_configuration";
set_var("_setup_done", 1);
set_var("_SETUP_DONE", 1);
}
$wait_time = 300;
}
@ -107,20 +107,20 @@ sub run {
if ($version_major < 9) {
# before GNOME 40 we get a per-user version of
# gnome-initial-setup here...
gnome_initial_setup() unless (get_var("_setup_done"));
gnome_initial_setup() unless (get_var("_SETUP_DONE"));
}
else {
# ...from GNOME 40 on, we just get a "Welcome" tour
handle_welcome_screen unless (get_var("_welcome_done"));
handle_welcome_screen unless (get_var("_WELCOME_DONE"));
}
}
if (get_version_major() > 8) {
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")) {
# handle welcome screen if we didn't do it above (holy flow
# control, Batman!)
handle_welcome_screen unless (get_var("_welcome_done"));
handle_welcome_screen unless (get_var("_WELCOME_DONE"));
# if this was an image deployment, we also need to create
# root user now, for subsequent tests to work
if (get_var("IMAGE_DEPLOY")) {