From 3ac7b5a6484974efb47626df90d2147cf25c4a36 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Wed, 19 Jun 2024 12:17:17 -0700 Subject: [PATCH] desktop_background: handle KDE post-upgrade welcome center When we test major KDE version upgrades, we get a post-upgrade version of the welcome center again after the upgrade, which we don't really expect. This breaks the background test because the welcome center is in the way of the background, it doesn't seem to break any other update tests. So let's just handle it here. Fortunately this version has an "OK" button we can click. Signed-off-by: Adam Williamson --- tests/desktop_background.pm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/desktop_background.pm b/tests/desktop_background.pm index 118134f4..2e57329c 100644 --- a/tests/desktop_background.pm +++ b/tests/desktop_background.pm @@ -11,7 +11,11 @@ sub run { # don't have any requirement for what background Rawhide uses. my $version = get_var('VERSION'); my $rawrel = get_var('RAWREL'); - assert_screen "${version}_background" if ($version ne "Rawhide" && $version ne $rawrel); + return unless ($version ne "Rawhide" && $version ne $rawrel); + # KDE shows a different version of the welcome center on major upgrades, + # which breaks this test + click_lastmatch if (get_var("DESKTOP") eq "kde" && get_var("ADVISORY_OR_TASK") && check_screen "kde_ok", 5); + assert_screen "${version}_background"; } sub test_flags {