From d515ad11957fe17640b020ccba3c39fc5925edf3 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Fri, 2 Aug 2024 11:53:23 -0700
Subject: [PATCH] Revert "desktop_update_graphical: try to workaround GGO
 #2442"

This reverts commit b3e5dd41cb13904a45b69e385ab16dd5cbb93476.
Some testing on lab seems to indicate it's not needed any more,
at least several runs with the workarounds reverted have passed.
Will put them back if we hit failures.
---
 templates.fif.json                |  3 +--
 tests/desktop_update_graphical.pm | 28 +++++-----------------------
 2 files changed, 6 insertions(+), 25 deletions(-)

diff --git a/templates.fif.json b/templates.fif.json
index 2f1b2e79..b3d30eff 100644
--- a/templates.fif.json
+++ b/templates.fif.json
@@ -1387,8 +1387,7 @@
                 "BOOTFROM": "c",
                 "HDD_1": "disk_%FLAVOR%_%MACHINE%.qcow2",
                 "POSTINSTALL": "desktop_update_graphical",
-                "START_AFTER_TEST": "%DEPLOY_UPLOAD_TEST%",
-                "RETRY": 2
+                "START_AFTER_TEST": "%DEPLOY_UPLOAD_TEST%"
             }
         },
         "install_anaconda_text": {
diff --git a/tests/desktop_update_graphical.pm b/tests/desktop_update_graphical.pm
index be52159d..2fb7c3e1 100644
--- a/tests/desktop_update_graphical.pm
+++ b/tests/desktop_update_graphical.pm
@@ -42,18 +42,9 @@ sub run {
     # GNOME Software 44+ has a 3rd party source pop-up, get rid of it
     # if it shows up (but don't fail if it doesn't, we're not testing that)
     if ($desktop eq 'gnome' && check_screen 'gnome_software_ignore', 10) {
-        # keep clicking till we hit it, it tends to wobble around,
-        # especially with GNOME 46 - part of
-        # https://gitlab.gnome.org/GNOME/gnome-software/-/issues/2442
-        click_lastmatch;
-        wait_still_screen 2;
-        my $count = 20;
-        while (check_screen 'gnome_software_ignore', 3) {
-            die "couldn't get rid of ignore screen!" if ($count == 0);
-            $count -= 1;
-            click_lastmatch;
-            wait_still_screen 2;
-        }
+        wait_still_screen 3;
+        # match again as the dialog may have moved a bit
+        assert_and_click 'gnome_software_ignore';
     }
     # go to the 'update' interface. We may be waiting some time at a
     # 'Software catalog is being loaded' screen.
@@ -62,17 +53,8 @@ sub run {
         mouse_set 10, 10;
         mouse_hide;
     }
-    if ($desktop eq 'gnome') {
-        # wait for it to settle, it seems to take a long time and sometimes
-        # go into 'app is not responding' mode - part of
-        # https://gitlab.gnome.org/GNOME/gnome-software/-/issues/2442
-        wait_still_screen 10;
-        # try to click in a 'neutral' area of the UI to get rid of the
-        # weird 'short window' state - another part of
-        # https://gitlab.gnome.org/GNOME/gnome-software/-/issues/2442
-        mouse_set 36, 128;
-        mouse_click;
-    }
+    # wait out a possible animation
+    wait_still_screen 5;
     assert_and_click 'desktop_package_tool_update';
     # wait for things to settle if e.g. GNOME is refreshing
     wait_still_screen 5, 90;