mirror of
https://pagure.io/fedora-qa/os-autoinst-distri-fedora.git
synced 2024-12-22 02:13:08 +00:00
Drop handling of 'transient' update notification in KDE
We seem to be solidly back to always getting a permanent update notification in current F36/Rawhide, so we don't need this more complex path any more. We also don't need these needles any more, they haven't matched for months.
This commit is contained in:
parent
01c2962f41
commit
8c298851a4
@ -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"
|
|
||||||
]
|
|
||||||
}
|
|
Binary file not shown.
Before Width: | Height: | Size: 938 KiB |
@ -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"
|
|
||||||
]
|
|
||||||
}
|
|
Binary file not shown.
Before Width: | Height: | Size: 837 KiB |
@ -13,7 +13,6 @@ use packagetest;
|
|||||||
sub run {
|
sub run {
|
||||||
my $self = shift;
|
my $self = shift;
|
||||||
my $desktop = get_var("DESKTOP");
|
my $desktop = get_var("DESKTOP");
|
||||||
my $relnum = get_release_number;
|
|
||||||
# for the live image case, handle bootloader here
|
# for the live image case, handle bootloader here
|
||||||
if (get_var("BOOTFROM")) {
|
if (get_var("BOOTFROM")) {
|
||||||
do_bootloader(postinstall=>1, params=>'3');
|
do_bootloader(postinstall=>1, params=>'3');
|
||||||
@ -76,15 +75,12 @@ sub run {
|
|||||||
send_key 'ret';
|
send_key 'ret';
|
||||||
}
|
}
|
||||||
check_desktop(timeout=>90);
|
check_desktop(timeout=>90);
|
||||||
# now, WE WAIT. Because KDE on F34+ shows a notification only
|
# now, WE WAIT. this is just an unconditional wait - rather than
|
||||||
# briefly we will keep an eye out and record if we saw it (logic
|
# breaking if we see an update notification appear - so we catch
|
||||||
# around this comes later). But we wait the whole ten minutes even
|
# things that crash a few minutes after startup, etc.
|
||||||
# if we see it so we catch any unwanted notifications that appear
|
|
||||||
# shortly after boot
|
|
||||||
my $seen = 0;
|
|
||||||
for my $n (1..16) {
|
for my $n (1..16) {
|
||||||
$seen = 1 if (check_screen "desktop_update_notification", 30);
|
sleep 30;
|
||||||
mouse_set 20, 20;
|
mouse_set 10, 10;
|
||||||
send_key "spc";
|
send_key "spc";
|
||||||
mouse_hide;
|
mouse_hide;
|
||||||
}
|
}
|
||||||
@ -124,30 +120,12 @@ sub run {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (get_var("BOOTFROM")) {
|
if (get_var("BOOTFROM")) {
|
||||||
if ($desktop eq 'kde' && $relnum > 33) {
|
# we should see an update notification and no others
|
||||||
# there is not always a permanent notification in F34+,
|
assert_screen "desktop_update_notification_only";
|
||||||
# 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";
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
# for the live case there should be *no* notifications
|
# for the live case there should be *no* notifications
|
||||||
assert_screen "desktop_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;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user