From db4ab638dad29985269252e92792838001699e6f Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Thu, 11 Oct 2018 16:05:38 -0700 Subject: [PATCH] Restore modified version of the #1314991 workaround for #1638563 We're not seeing *exactly* #1314991 any more, but we're seeing something that looks quite similar: the first attempt to find updates just doesn't find any. No error message, no updates. I have reported a bug for this and am investigating it, in the meantime, let's restore the workaround, elaborated a bit, and looking for the 'Software is up to date' screen instead of the error message. Signed-off-by: Adam Williamson --- .../gnome/desktop_package_tool_uptodate.json | 16 +++++++++++++ .../gnome/desktop_package_tool_uptodate.png | Bin 0 -> 14995 bytes tests/desktop_update_graphical.pm | 22 +++++++++++++++++- 3 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 needles/gnome/desktop_package_tool_uptodate.json create mode 100644 needles/gnome/desktop_package_tool_uptodate.png diff --git a/needles/gnome/desktop_package_tool_uptodate.json b/needles/gnome/desktop_package_tool_uptodate.json new file mode 100644 index 00000000..b34a010f --- /dev/null +++ b/needles/gnome/desktop_package_tool_uptodate.json @@ -0,0 +1,16 @@ +{ + "area": [ + { + "ypos": 366, + "type": "match", + "width": 91, + "height": 77, + "xpos": 471 + } + ], + "properties": [], + "tags": [ + "DESKTOP-gnome", + "desktop_package_tool_uptodate" + ] +} diff --git a/needles/gnome/desktop_package_tool_uptodate.png b/needles/gnome/desktop_package_tool_uptodate.png new file mode 100644 index 0000000000000000000000000000000000000000..c851f0f2c71b1e8534f6b30142f4db35ce90322c GIT binary patch literal 14995 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 literal 0 HcmV?d00001 diff --git a/tests/desktop_update_graphical.pm b/tests/desktop_update_graphical.pm index b9dba853..28cc48ab 100644 --- a/tests/desktop_update_graphical.pm +++ b/tests/desktop_update_graphical.pm @@ -46,7 +46,27 @@ sub run { # refresh updates assert_and_click 'desktop_package_tool_update_refresh', '', 120; } - for my $n (1..5) { + # wait for refresh, then apply updates, using a C-style loop so we + # can reset it if needed due to RHBZ #1314991. We will retry a max + # of two times if we hit refresh and wind up being told the system + # is up to date. + my $retries = 2; + for (my $n = 1; $n < 6; $n++) { + # TEST TEST Check if refresh completes and g-s thinks we're + # up-to-date, if so, refresh and restart the loop + if (check_screen 'desktop_package_tool_uptodate', 1) { + if ($retries == 2) { + record_soft_failure "Refresh did not find available update - #1638563. Retrying"; + } + if ($retries > 0) { + assert_and_click 'desktop_package_tool_update_refresh'; + $n = 1; + } + else { + die "Retried refresh too many times, giving up"; + } + $retries -= 1; + } last if (check_screen 'desktop_package_tool_update_apply', 120); mouse_set 10, 10; mouse_hide;