From 09a0f19e36a8f4f050d73e9db339d5749d9d7f49 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Fri, 19 Feb 2021 17:58:58 -0800 Subject: [PATCH] Try and split 'g-i-s done' and 'welcome tour done' They're not always the same, and it's breaking things on aarch64. Signed-off-by: Adam Williamson --- lib/utils.pm | 1 + tests/_graphical_wait_login.pm | 24 ++++++++++-------------- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/lib/utils.pm b/lib/utils.pm index b7d9e81a..54ca57e9 100644 --- a/lib/utils.pm +++ b/lib/utils.pm @@ -670,6 +670,7 @@ sub handle_welcome_screen { else { record_soft_failure "Welcome tour missing"; } + set_var("_welcome_done", 1); } sub gnome_initial_setup { diff --git a/tests/_graphical_wait_login.pm b/tests/_graphical_wait_login.pm index 24b771b0..89f14d00 100644 --- a/tests/_graphical_wait_login.pm +++ b/tests/_graphical_wait_login.pm @@ -78,25 +78,21 @@ sub run { # as this test gets loaded twice on the ADVISORY_OR_TASK flow, and # we might be on the INSTALL_NO_USER flow, check whether # this happened already - unless (get_var("_setup_done")) { - my $relnum = get_release_number; - if ($relnum < 34) { - # before GNOME 40 (F34), we get a per-user version of - # gnome-initial-setup here... - gnome_initial_setup(); - } - else { - # ...from GNOME 40 on, we just get a "Welcome" tour - handle_welcome_screen; - # protect against expecting it again - set_var("_setup_done"); - } + my $relnum = get_release_number; + if ($relnum < 34) { + # before GNOME 40 (F34), we get a per-user version of + # gnome-initial-setup here... + 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")); } } 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("_setup_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")) {