srbala
/
os-autoinst-distri-fedora
mirror of https://pagure.io/fedora-qa/os-autoinst-distri-fedora.git
1
0
Fork 0
Code Issues Releases Activity

Just *always* expect a welcome tour now 

Plasma 5.27.1 is going all the way back to F36 (in
FEDORA-2023-d7dcc38129), so we'll have a welcome tour on both
desktops we actually test on, on all supported releases. So we
can just drop the desktop conditional entirely here now.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2023-02-23 09:41:46 -08:00
parent bb3492ac9d
commit 8e68c385d3
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
tests/_graphical_wait_login.pm
View File

@ -76,22 +76,17 @@ sub run {
_enter_password($password);
}
# For GNOME, handle initial-setup or welcome tour, unless _WELCOME_DONE
# is set (indicating it's been done previously within this test run,
# e.g. the second time this module runs on the update flow, or earlier
# in the boot process on the INSTALL_NO_USER flow), or START_AFTER_TEST
# is set to the same value as DEPLOY_UPLOAD_TEST (in which case it will
# have been done by the previous test run)
# Handle the welcome tour, unless _WELCOME_DONE is set (indicating
# it's been done previously within this test run, e.g. the second
# time this module runs on the update flow, or earlier in the boot
# process on the INSTALL_NO_USER flow), or START_AFTER_TEST is set
# to the same value as DEPLOY_UPLOAD_TEST (in which case it will
# have been done by the previous test run).
# the point of the default values here is to make the check fail if
# neither var is set, without needing an extra condition
my $sat = get_var("START_AFTER_TEST", "1");
my $dut = get_var("DEPLOY_UPLOAD_TEST", "2");
my $relnum = get_release_number;
handle_welcome_screen if (
($desktop eq 'gnome' || ($desktop eq 'kde' && $relnum > 36)) &&
$sat ne $dut &&
!get_var("_WELCOME_DONE")
);
handle_welcome_screen if ($sat ne $dut && !get_var("_WELCOME_DONE"));
if (get_var("IMAGE_DEPLOY")) {
# if this was an image deployment, we also need to create
# root user now, for subsequent tests to work