Revert "uitest: try harder to close the dialog when it fails..."
This reverts commit ff641dc9e4.
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@libreoffice.org>
This commit is contained in:
@@ -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))
|
||||
|
||||
Reference in New Issue
Block a user