Fix desktop update test for KDE in F34+

We now have to run Plasma Discover, not use the systray thing.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2021-03-27 15:01:31 -07:00
parent 10af8015ea
commit 1fc2edfda4
5 changed files with 48 additions and 9 deletions

View File

@ -0,0 +1,16 @@
{
"area": [
{
"ypos": 520,
"width": 19,
"xpos": 18,
"type": "match",
"height": 18
}
],
"properties": [],
"tags": [
"DESKTOP-kde",
"desktop_package_tool_update"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 470 KiB

View File

@ -0,0 +1,16 @@
{
"area": [
{
"xpos": 477,
"width": 48,
"ypos": 332,
"height": 15,
"type": "match"
}
],
"properties": [],
"tags": [
"DESKTOP-kde",
"kde_offline_update_reboot"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 472 KiB

View File

@ -17,12 +17,18 @@ sub run {
# run the updater # run the updater
if ($desktop eq 'kde') { if ($desktop eq 'kde') {
# get rid of notifications which get in the way of the things # KDE team tells me until F34 the 'preferred' update method
# we need to click # was the systray applet...
click_unwanted_notifications; if ($relnum < 34) {
# KDE team tells me the 'preferred' update method is the # get rid of notifications which get in the way of the things
# systray applet # we need to click
assert_and_click 'desktop_expand_systray'; click_unwanted_notifications;
assert_and_click 'desktop_expand_systray';
}
else {
# ...from F34 onwards, it's Plasma Discover app
menu_launch_type('discover');
}
} }
else { else {
# this launches GNOME Software on GNOME, dunno for any other # this launches GNOME Software on GNOME, dunno for any other
@ -35,9 +41,10 @@ sub run {
if ($desktop eq 'gnome' && check_screen 'gnome_software_welcome', 10) { if ($desktop eq 'gnome' && check_screen 'gnome_software_welcome', 10) {
send_key 'ret'; send_key 'ret';
} }
# go to the 'update' interface. For GNOME, we may be waiting # go to the 'update' interface. For GNOME or KDE on F34+, we
# some time at a 'Software catalog is being loaded' screen. # may be waiting some time at a 'Software catalog is being
if ($desktop eq 'gnome') { # loaded' screen.
if ($desktop eq 'gnome' || ($desktop eq 'kde' && $relnum > 33)) {
for my $n (1..5) { for my $n (1..5) {
last if (check_screen 'desktop_package_tool_update', 120); last if (check_screen 'desktop_package_tool_update', 120);
mouse_set 10, 10; mouse_set 10, 10;