From 12fe58cd918db0076b627bbb007ed93598464de4 Mon Sep 17 00:00:00 2001
From: Cole Robinson <crobinso@redhat.com>
Date: Mon, 21 Sep 2020 21:29:00 -0400
Subject: [PATCH] uitests: Use drag() method again for window cleanup tests

delete and createvm tests launch a dialog which obstructs the
manager UI. The location can be kinda random, and it might obstruct
selecting the connection in the manager window. Go back to using
the drag() window pattern to make this more deterministic

Signed-off-by: Cole Robinson <crobinso@redhat.com>
---
 tests/uitests/lib/app.py       | 26 ++++++++++++++++++++------
 tests/uitests/test_createvm.py |  7 +------
 tests/uitests/test_delete.py   |  6 +-----
 virtManager/manager.py         |  1 +
 4 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/tests/uitests/lib/app.py b/tests/uitests/lib/app.py
index 5b4e842b..221808d0 100644
--- a/tests/uitests/lib/app.py
+++ b/tests/uitests/lib/app.py
@@ -38,10 +38,11 @@ class VMMDogtailApp(object):
     def sleep(self, *args, **kwargs):
         return time.sleep(*args, **kwargs)
 
-    def find_window(self, name, roleName=None):
+    def find_window(self, name, roleName=None, check_active=True):
         if roleName is None:
             roleName = "(frame|dialog|alert|window)"
-        return self.root.find(name=name, roleName=roleName, recursive=False)
+        return self.root.find(name=name, roleName=roleName,
+                recursive=False, check_active=check_active)
 
     rawinput = dogtail.rawinput
     tree = dogtail.tree
@@ -51,9 +52,10 @@ class VMMDogtailApp(object):
     # virt-manager specific helpers #
     #################################
 
-    def get_manager(self):
+    def get_manager(self, check_active=True):
         if not self._manager:
-            self._manager = self.find_window("Virtual Machine Manager")
+            self._manager = self.find_window("Virtual Machine Manager",
+                    check_active=check_active)
         return self._manager
 
     def find_details_window(self, vmname,
@@ -115,15 +117,19 @@ class VMMDogtailApp(object):
 
     def manager_conn_disconnect(self, conn_label):
         c = self.manager_get_conn_cell(conn_label)
+        c.click()
+        utils.check(lambda: c.state_selected)
         c.click(button=3)
-        self.root.find("conn-disconnect", "menu item").click()
+        menu = self.root.find("conn-menu", "menu")
+        menu.find("conn-disconnect", "menu item").click()
         utils.check(lambda: "Not Connected" in c.text)
         return c
 
     def manager_conn_delete(self, conn_label):
         c = self.manager_get_conn_cell(conn_label)
         c.click(button=3)
-        self.root.find("conn-delete", "menu item").click()
+        menu = self.root.find("conn-menu", "menu")
+        menu.find("conn-delete", "menu item").click()
         self.click_alert_button("will remove the connection", "Yes")
         utils.check(lambda: c.dead)
 
@@ -212,6 +218,14 @@ class VMMDogtailApp(object):
         win.find_fuzzy(tab, "page tab").click()
         return win
 
+    def manager_test_conn_window_cleanup(self, conn_label, childwin):
+        # Give time for the child window to appear and possibly grab focus
+        self.sleep(1)
+        self.get_manager(check_active=False)
+        dogtail.rawinput.drag(childwin.title_coordinates(), (1000, 1000))
+        self.manager_conn_disconnect(conn_label)
+        utils.check(lambda: not childwin.showing)
+
 
     ###########################
     # Process management APIs #
diff --git a/tests/uitests/test_createvm.py b/tests/uitests/test_createvm.py
index 0b48d567..f86a56ef 100644
--- a/tests/uitests/test_createvm.py
+++ b/tests/uitests/test_createvm.py
@@ -1190,13 +1190,8 @@ def testNewVMSession(app):
     details.window_close()
 
     # Ensure disconnecting will close the dialog
-    manager = app.topwin
-    manager.window_maximize()
     newvm = _open_newvm(app)
-    app.sleep(.5)  # newvm focus grab avoidance
-    manager.grab_focus()
-    app.manager_conn_disconnect(".*session.*")
-    lib.utils.check(lambda: not newvm.showing)
+    app.manager_test_conn_window_cleanup(".*session.*", newvm)
 
 
 def testNewVMEmptyConn(app):
diff --git a/tests/uitests/test_delete.py b/tests/uitests/test_delete.py
index 0d8238d1..2e990fb1 100644
--- a/tests/uitests/test_delete.py
+++ b/tests/uitests/test_delete.py
@@ -176,12 +176,8 @@ def testDeleteFailure(app, tmppath):
     app.click_alert_button("Errors encountered", "Close")
 
     # Ensure disconnecting will close the dialog
-    manager = app.topwin
-    manager.window_maximize()
     win = _open_delete(app, "test-clone")
-    manager.click_title()
-    app.manager_conn_disconnect("test testdriver.xml")
-    lib.utils.check(lambda: not win.showing)
+    app.manager_test_conn_window_cleanup("test testdriver.xml", win)
 
 
 def testDeleteRemoteManyDevices(app):
diff --git a/virtManager/manager.py b/virtManager/manager.py
index c5f57cc3..c683f2bb 100644
--- a/virtManager/manager.py
+++ b/virtManager/manager.py
@@ -98,6 +98,7 @@ class vmmManager(vmmGObjectUI):
         self.vmmenu = vmmenu.VMActionMenu(self, self.current_vm)
         self.shutdownmenu = vmmenu.VMShutdownMenu(self, self.current_vm)
         self.connmenu = Gtk.Menu()
+        self.connmenu.get_accessible().set_name("conn-menu")
         self.connmenu_items = {}
 
         self.builder.connect_signals({