fix widget stack lookup

Author: saw-jan

test/gui/shared/scripts/bdd_hooks.py

@@ -205,11 +205,11 @@ def hook(context):
 def teardown_client():
     # Cleanup user accounts from UI for Windows platform
     # It is not needed for Linux so skipping it in order to save CI time
-    if not isWindows():
+    if isWindows():
         # remove account from UI
         # In Windows, removing only config and sync folders won't help
         # so to work around that, remove the account connection
-        close_open_dialogs()
+        close_dialogs()
         close_widgets()
         server_host = urlparse(get_config('localBackendUrl')).netloc
         accounts = Toolbar.get_accounts()
@@ -242,7 +242,7 @@ def teardown_client():
             test.log(f'Failed to delete{entry.name}. Reason: {e}.')
 
 
-def close_open_dialogs():
+def close_dialogs():
     # close the current active dailog if it's not a main client window
     while True:
         active_window = QApplication.activeModalWidget()
@@ -257,15 +257,20 @@ def close_open_dialogs():
 
 
 def close_widgets():
-    ch = object.children(squish.waitForObject(AccountSetting.DIALOG_STACK))
-    for obj in ch:
-        if (
-            hasattr(obj, "objectName")
-            and obj.objectName != ''
-            and obj.objectName != "page"
-        ):
-            obj.close()
-            # if the dialog has a confirmation dialog, confirm it
-            confirm_dialog = QApplication.activeModalWidget()
-            if str(confirm_dialog) != "<null>" and confirm_dialog.visible:
-                clickButton(waitForObject(AccountSetting.CONFIRMATION_YES_BUTTON))
+    try:
+        ch = object.children(squish.waitForObject(AccountSetting.DIALOG_STACK, 500))
+        for obj in ch:
+            if (
+                hasattr(obj, "objectName")
+                and obj.objectName != ''
+                and obj.objectName != "page"
+            ):
+                obj.close()
+                # if the dialog has a confirmation dialog, confirm it
+                confirm_dialog = QApplication.activeModalWidget()
+                if str(confirm_dialog) != "<null>" and confirm_dialog.visible:
+                    clickButton(waitForObject(AccountSetting.CONFIRMATION_YES_BUTTON))
+    except LookupError:
+        # nothing to close if DIALOG_STACK is not found
+        # required for client versions <= 5
+        pass

test/gui/shared/scripts/helpers/SetupClientHelper.py

@@ -1,7 +1,7 @@
 from urllib.parse import urlparse
 import squish, test
 import subprocess
-from os import makedirs, path
+from os import makedirs
 from os.path import exists, join
 from helpers.SpaceHelper import get_space_id
 from helpers.ConfigHelper import get_config, set_config, isWindows