diff --git a/needles/kde/desktop_update_notification-kde-noto-20210407.json b/needles/kde/desktop_update_notification-kde-noto-20210407.json deleted file mode 100644 index 34625f8d..00000000 --- a/needles/kde/desktop_update_notification-kde-noto-20210407.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "area": [ - { - "type": "match", - "height": 17, - "width": 124, - "xpos": 659, - "ypos": 599 - }, - { - "ypos": 323, - "type": "match", - "height": 13, - "xpos": 199, - "width": 13 - } - ], - "properties": [], - "tags": [ - "DESKTOP-kde", - "desktop_update_notification_popup", - "desktop_update_notification" - ] -} \ No newline at end of file diff --git a/needles/kde/desktop_update_notification-kde-noto-20210407.png b/needles/kde/desktop_update_notification-kde-noto-20210407.png deleted file mode 100644 index 95175262..00000000 Binary files a/needles/kde/desktop_update_notification-kde-noto-20210407.png and /dev/null differ diff --git a/needles/kde/desktop_update_notification_only-kde-20210615.json b/needles/kde/desktop_update_notification_only-kde-20210615.json deleted file mode 100644 index d67b6400..00000000 --- a/needles/kde/desktop_update_notification_only-kde-20210615.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "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" - ] -} \ No newline at end of file diff --git a/needles/kde/desktop_update_notification_only-kde-20210615.png b/needles/kde/desktop_update_notification_only-kde-20210615.png deleted file mode 100644 index b32d63d6..00000000 Binary files a/needles/kde/desktop_update_notification_only-kde-20210615.png and /dev/null differ diff --git a/tests/desktop_notifications.pm b/tests/desktop_notifications.pm index b4518afa..748b904d 100644 --- a/tests/desktop_notifications.pm +++ b/tests/desktop_notifications.pm @@ -13,7 +13,6 @@ use packagetest; sub run { my $self = shift; my $desktop = get_var("DESKTOP"); - my $relnum = get_release_number; # for the live image case, handle bootloader here if (get_var("BOOTFROM")) { do_bootloader(postinstall=>1, params=>'3'); @@ -76,15 +75,12 @@ sub run { send_key 'ret'; } check_desktop(timeout=>90); - # now, WE WAIT. Because KDE on F34+ shows a notification only - # briefly we will keep an eye out and record if we saw it (logic - # around this comes later). But we wait the whole ten minutes even - # if we see it so we catch any unwanted notifications that appear - # shortly after boot - my $seen = 0; + # now, WE WAIT. this is just an unconditional wait - rather than + # breaking if we see an update notification appear - so we catch + # things that crash a few minutes after startup, etc. for my $n (1..16) { - $seen = 1 if (check_screen "desktop_update_notification", 30); - mouse_set 20, 20; + sleep 30; + mouse_set 10, 10; send_key "spc"; mouse_hide; } @@ -124,30 +120,12 @@ sub run { } } if (get_var("BOOTFROM")) { - if ($desktop eq 'kde' && $relnum > 33) { - # there is not always a permanent notification in F34+, - # if we don't see one, check we saw the transient one - # earlier. FIXME: maybe drop the 'transient' path here - # 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 - assert_screen "desktop_update_notification_only"; - } + # we should see an update notification and no others + assert_screen "desktop_update_notification_only"; } else { # for the live case there should be *no* notifications assert_screen "desktop_no_notifications"; - if ($desktop eq 'kde' && $relnum > 33) { - # and no tray icon either - die "Systray update notification should not be present on live!" if (check_screen "desktop_update_notification_systray"); - die "Transient notification should not be shown on live!" if $seen; - } } }