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

Try and split 'g-i-s done' and 'welcome tour done'

Browse Source 
They're not always the same, and it's breaking things on aarch64.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2021-02-19 17:58:58 -08:00
parent 784962c96e
commit 09a0f19e36
2 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/utils.pm
View File

@ -670,6 +670,7 @@ sub handle_welcome_screen {
else { else {
record_soft_failure "Welcome tour missing"; record_soft_failure "Welcome tour missing";
} }
set_var("_welcome_done", 1);
} }
sub gnome_initial_setup { sub gnome_initial_setup {

24
tests/_graphical_wait_login.pm
View File

@ -78,25 +78,21 @@ sub run {
# 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
unless (get_var("_setup_done")) { my $relnum = get_release_number;
my $relnum = get_release_number; if ($relnum < 34) {
if ($relnum < 34) { # before GNOME 40 (F34), we get a per-user version of
# before GNOME 40 (F34), we get a per-user version of # gnome-initial-setup here...
# gnome-initial-setup here... gnome_initial_setup() unless (get_var("_setup_done"));
gnome_initial_setup(); }
} else {
else { # ...from GNOME 40 on, we just get a "Welcome" tour
# ...from GNOME 40 on, we just get a "Welcome" tour handle_welcome_screen unless (get_var("_welcome_done"));
handle_welcome_screen;
# protect against expecting it again
set_var("_setup_done");
}
} }
} }
if (get_var("DESKTOP") eq 'gnome' && get_var("INSTALL_NO_USER")) { if (get_var("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("_setup_done")); handle_welcome_screen unless (get_var("_welcome_done"));
# if this was an image deployment, we also need to create # if this was an image deployment, we also need to create
# root user now, for subsequent tests to work # root user now, for subsequent tests to work
if (get_var("IMAGE_DEPLOY")) { if (get_var("IMAGE_DEPLOY")) {