From 4c83347d54fb5e1a1aa9b9b399bc0d48690dbfb4 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Tue, 27 Feb 2024 19:49:40 -0800 Subject: [PATCH] Adjust for webUI deferral to Fedora 41 Same as the deferral from 39 to 40, except one of the tests has gone away in the mean time. Signed-off-by: Adam Williamson --- lib/utils.pm | 2 +- tests/desktop_notifications.pm | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/utils.pm b/lib/utils.pm index 2ff0c066..e1611774 100644 --- a/lib/utils.pm +++ b/lib/utils.pm @@ -847,7 +847,7 @@ sub gnome_initial_setup { # https://fedoraproject.org//wiki/Changes/ReduceInitialSetupRedundancy # https://bugzilla.redhat.com/show_bug.cgi?id=1474787 , # except 'language' was never *really* skipped (see above) - if ($relnum < 40) { + if ($relnum < 41) { @nexts = grep { $_ ne 'keyboard' } @nexts; @nexts = grep { $_ ne 'timezone' } @nexts; } diff --git a/tests/desktop_notifications.pm b/tests/desktop_notifications.pm index 560c9d99..fbc6fd73 100644 --- a/tests/desktop_notifications.pm +++ b/tests/desktop_notifications.pm @@ -91,9 +91,9 @@ sub run { type_very_safely get_var("USER_PASSWORD", "weakpassword"); send_key 'ret'; } - elsif ($desktop eq 'gnome' && $relnum > 39) { - # since g-i-s 45~beta-3 we get a short g-i-s flow on live boot - # then the welcome tour + elsif ($desktop eq 'gnome' && $relnum > 40) { + # with https://fedoraproject.org/wiki/Changes/AnacondaWebUIforFedoraWorkstation + # we get a short g-i-s flow on live boot then the welcome tour gnome_initial_setup(live => 1, livetry => 1); handle_welcome_screen; }