[Libreoffice-commits] core.git: uitest/uitest

[Xisco Fauli (via logerrit)]

 uitest/uitest/test.py |    8 --------
 1 file changed, 8 deletions(-)

New commits:
commit 4f8748fc973acdb67790ff048a247717afa9b9c7
Author:     Xisco Fauli <xiscofauli at libreoffice.org>
AuthorDate: Fri Jul 2 20:41:50 2021 +0200
Commit:     Xisco Fauli <xiscofauli at libreoffice.org>
CommitDate: Fri Jul 2 21:45:04 2021 +0200

    Revert "uitest: try harder to close the dialog when it fails..."
    
    This reverts commit ff641dc9e4d2aff1d1cbe4425cd9c03a2edc847e.
    
    Reason for revert: This patch is wrong, when close_button is set, the exceptions will be caught here so the test won't fail
    
    Change-Id: Id884abe70ab5602f914742e91bb2ed644c23b041
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118303
    Tested-by: Jenkins
    Reviewed-by: Xisco Fauli <xiscofauli at libreoffice.org>

diff --git a/uitest/uitest/test.py b/uitest/uitest/test.py
index c1688f84be96..fe06c1e65817 100644
--- a/uitest/uitest/test.py
+++ b/uitest/uitest/test.py
@@ -119,10 +119,6 @@ class UITest(object):
                     xDialog = self._xUITest.getTopFocusWindow()
                     try:
                         yield xDialog
-                    except:
-                        if not close_button:
-                            if 'cancel' in xDialog.getChildren():
-                                self.close_dialog_through_button(xDialog.getChild("cancel"))
                     finally:
                         if close_button:
                             self.close_dialog_through_button(xDialog.getChild(close_button))
@@ -257,10 +253,6 @@ class UITest(object):
                     xDialog = self._xUITest.getTopFocusWindow()
                     try:
                         yield xDialog
-                    except:
-                        if not close_button:
-                            if 'cancel' in xDialog.getChildren():
-                                self.close_dialog_through_button(xDialog.getChild("cancel"))
                     finally:
                         if close_button:
                             self.close_dialog_through_button(xDialog.getChild(close_button))