From 34321dae8fd9fdee8be6566566dc097a95292f62 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Tue, 16 Jul 2019 13:58:15 -0700 Subject: [PATCH] desktop_notifications: handle multiple KDE update notifications Current KDE seems to like showing us multiple update available notifications. So the test must dismiss all of them. See: https://bugzilla.redhat.com/show_bug.cgi?id=1730482 Signed-off-by: Adam Williamson --- tests/desktop_notifications.pm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/tests/desktop_notifications.pm b/tests/desktop_notifications.pm index 991fbf9e..4fe1b190 100644 --- a/tests/desktop_notifications.pm +++ b/tests/desktop_notifications.pm @@ -94,9 +94,14 @@ sub run { # this is the case from F30 and earlier where we know this # was the *only* notification; at this point we've passed return if match_has_tag "desktop_update_notification_only"; - # otherwise, we need to close the update notification then - # check there are no others - assert_and_click "desktop_update_notification"; + # otherwise, we need to close the update notification(s) + # then check there are no others; see + # https://bugzilla.redhat.com/show_bug.cgi?id=1730482 for + # KDE showing multiple notifications + my $count = 10; + while (check_screen "desktop_update_notification", 5 && $count > 0) { + assert_and_click "desktop_update_notification"; + } } # the order and number of systray icons varies in KDE, so we # can't really just use a systray 'no notifications' needle.