Handle KDE having a permanent update notification again

Looks like the latest Rawhide got a permanent update notification
for KDE again. F34 is still around, though, so we can't just
revert to the old code, I don't think.

Signed-off-by: Adam Williamson <awilliam@redhat.com>

needles/kde/desktop_update_notification_only-kde-20210615.json

@@ -0,0 +1,23 @@
+{
+  "area": [
+    {
+      "xpos": 590,
+      "ypos": 397,
+      "width": 127,
+      "height": 15,
+      "type": "match"
+    },
+    {
+      "xpos": 973,
+      "ypos": 396,
+      "width": 39,
+      "height": 173,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "DESKTOP-kde",
+    "desktop_update_notification_only"
+  ]
+}

tests/desktop_notifications.pm

@@ -119,10 +119,15 @@ sub run {
     }
     if (get_var("BOOTFROM")) {
         if ($desktop eq 'kde' && $relnum > 33) {
-            # there is no permanent notification in F34+, check we saw
+            # there is not always a permanent notification in F34+,
-            # the transient one earlier and we see no others now
+            # if we don't see one, check we saw the transient one
-            assert_screen "desktop_no_notifications";
+            # earlier. FIXME: maybe drop the 'transient' path here
-            die "No update notification was shown!" unless $seen;
+            # if the permanent notification seems to be reliably
+            # back after 2021-06-13 Rawhide?
+            assert_screen ["desktop_no_notifications", "desktop_update_notification_only"];
+            if (match_has_tag "desktop_no_notifications") {
+                die "No update notification was shown!" unless $seen;
+            }
         }
         else {
             # we should see an update notification and no others