testing/os-autoinst-distri-rocky-migrated
10
0
Fork 0
Code Issues 12 Pull Requests 1 Packages Projects Releases Wiki Activity

Remove RHBZ #1638563 workaround

Browse Source 
The fix for this bug was sent to all releases now, so we should
not need the workaround any more. Let's kill it.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2018-12-17 12:02:57 -08:00
parent b171c0a1c4
commit 517750443e
1 changed files with 4 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
tests/desktop_update_graphical.pm
View File

@ -47,12 +47,10 @@ sub run {
assert_and_click 'desktop_package_tool_update_refresh', '', 120; assert_and_click 'desktop_package_tool_update_refresh', '', 120;
} }
# wait for refresh, then apply updates, moving the mouse every two # wait for refresh, then apply updates, moving the mouse every two
# minutes to avoid the idle screen blank kicking in. We use a C- # minutes to avoid the idle screen blank kicking in. Depending on
# style loop so we can reset it if needed due to RHBZ #1638563. We # whether this is KDE or GNOME and what Fedora release, we may see
# will retry a max of two times if we hit refresh and wind up # 'apply' right away, or 'download' then 'apply'.
# being told the system is up to date. my $tags = ['desktop_package_tool_update_download', 'desktop_package_tool_update_apply'];
my $retries = 2;
my $tags = ['desktop_package_tool_update_download', 'desktop_package_tool_update_apply', 'desktop_package_tool_update_refresh'];
for (my $n = 1; $n < 6; $n++) { for (my $n = 1; $n < 6; $n++) {
if (check_screen $tags, 120) { if (check_screen $tags, 120) {
# if we see 'apply', we're done here, quit out of the loop # if we see 'apply', we're done here, quit out of the loop
@ -66,20 +64,6 @@ sub run {
$tags = ['desktop_package_tool_update_apply']; $tags = ['desktop_package_tool_update_apply'];
next; next;
} }
# otherwise, the refresh button came back - that's the bug
if ($retries == 2) {
# only record the soft fail on the *first* retry
record_soft_failure "Refresh did not find available update - #1638563. Retrying";
}
if ($retries > 0) {
assert_and_click 'desktop_package_tool_update_refresh';
# reset the loop counter so we get another 10 minutes
$n = 1;
}
else {
die "Retried refresh too many times, giving up";
}
$retries -= 1;
} }
# move the mouse to stop the screen blanking on idle # move the mouse to stop the screen blanking on idle
mouse_set 10, 10; mouse_set 10, 10;