1
0
mirror of https://pagure.io/fedora-qa/os-autoinst-distri-fedora.git synced 2024-11-25 15:23:08 +00:00

Handle KDE defaulting to offline updates in F34+

We need to hit 'restart' after applying updates, and we also
need the 'done' needle *not* to match the restart message, so
change that to match on the text (unfortunately). That also
means we have to add another variant of the needle for F32 as
the background of the text is a different color there.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2021-02-25 14:54:00 -08:00
parent de36bd2d12
commit e1a6d2c22b
6 changed files with 42 additions and 4 deletions

View File

@ -0,0 +1,16 @@
{
"area": [
{
"ypos": 651,
"height": 17,
"width": 134,
"type": "match",
"xpos": 656
}
],
"properties": [],
"tags": [
"DESKTOP-kde",
"desktop_package_tool_update_done"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 MiB

View File

@ -1,11 +1,11 @@
{ {
"area": [ "area": [
{ {
"height": 24, "height": 14,
"type": "match", "type": "match",
"width": 21, "width": 141,
"xpos": 644, "xpos": 684,
"ypos": 675 "ypos": 670
} }
], ],
"properties": [], "properties": [],

View File

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 466 KiB

View File

@ -7,6 +7,7 @@ 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;
# use a tty console for repo config and package prep # use a tty console for repo config and package prep
$self->root_console(tty=>3); $self->root_console(tty=>3);
assert_script_run 'dnf config-manager --set-disabled updates-testing'; assert_script_run 'dnf config-manager --set-disabled updates-testing';
@ -86,6 +87,11 @@ sub run {
} }
boot_to_login_screen; boot_to_login_screen;
} }
elsif ($desktop eq 'kde' && $relnum > 33) {
# KDE does offline updates now, we have to trigger the reboot
assert_and_click 'kde_offline_update_reboot';
boot_to_login_screen;
}
else { else {
assert_screen 'desktop_package_tool_update_done', 180; assert_screen 'desktop_package_tool_update_done', 180;
} }