diff --git a/needles/gnome/desktop_package_tool_update_bz1314991-20171219.json b/needles/gnome/desktop_package_tool_update_bz1314991-20171219.json deleted file mode 100644 index 87d38476..00000000 --- a/needles/gnome/desktop_package_tool_update_bz1314991-20171219.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "area": [ - { - "width": 191, - "xpos": 393, - "ypos": 92, - "type": "match", - "height": 21 - } - ], - "properties": [], - "tags": [ - "DESKTOP-gnome", - "desktop_package_tool_update_bz1314991" - ] -} \ No newline at end of file diff --git a/needles/gnome/desktop_package_tool_update_bz1314991-20171219.png b/needles/gnome/desktop_package_tool_update_bz1314991-20171219.png deleted file mode 100644 index b364d336..00000000 Binary files a/needles/gnome/desktop_package_tool_update_bz1314991-20171219.png and /dev/null differ diff --git a/needles/gnome/desktop_package_tool_update_bz1314991.json b/needles/gnome/desktop_package_tool_update_bz1314991.json deleted file mode 100644 index 1b0fe0d2..00000000 --- a/needles/gnome/desktop_package_tool_update_bz1314991.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "tags": [ - "DESKTOP-gnome", - "desktop_package_tool_update_bz1314991" - ], - "properties": [], - "area": [ - { - "xpos": 455, - "ypos": 344, - "width": 114, - "height": 114, - "type": "match" - } - ] -} \ No newline at end of file diff --git a/needles/gnome/desktop_package_tool_update_bz1314991.png b/needles/gnome/desktop_package_tool_update_bz1314991.png deleted file mode 100644 index 5336c81c..00000000 Binary files a/needles/gnome/desktop_package_tool_update_bz1314991.png and /dev/null differ diff --git a/tests/desktop_update_graphical.pm b/tests/desktop_update_graphical.pm index 08f5c940..b9dba853 100644 --- a/tests/desktop_update_graphical.pm +++ b/tests/desktop_update_graphical.pm @@ -46,16 +46,7 @@ sub run { # refresh updates assert_and_click 'desktop_package_tool_update_refresh', '', 120; } - # wait for refresh, then apply updates, using a C-style loop so we - # can reset it if needed due to RHBZ #1314991 - for (my $n = 1; $n < 6; $n++) { - # Check if we see the 'cancelled by user action' error we get - # when #1314991 happens, if so, refresh and restart the loop - if (check_screen 'desktop_package_tool_update_bz1314991', 1) { - record_soft_failure "RHBZ #1314991 (background PK operation interfered with update)"; - assert_and_click 'desktop_package_tool_update_refresh'; - $n = 1; - } + for my $n (1..5) { last if (check_screen 'desktop_package_tool_update_apply', 120); mouse_set 10, 10; mouse_hide;