Kaydet (Commit) ef03e3a3 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Revert "uitest: add timeout for blocking actions"

This reverts commit fb4d5885:

"For one, as Michael already responded, many builds (local, Gerrit/Jenkins,
other tinderboxes) now fail UITest_writerperfect_epubexport with what looks like
random 'raise DialogNotClosedException()'.  Gut feeling is that it's way more
than used to fail UITest_writerperfect_epubexport with a deadlock."
"Re: UITest_writerperfect_epubexport hang (only sometimes)")  For example,
<https://gerrit.libreoffice.org/#/c/50070/> "tdf#115853: save current custom
property when adding line" Jenkins linux_clang_dbgutil_64 now failed twice in a
row with what looks like random "raise DialogNotClosedException()" failures in

And for another:  "As long as its unclear what the underlying problem is, what
benefit does it have to add a timeout failure path in the test?  Without the
added timeout, a local failed test will be ready to be inspected (and moggi now
gave suggestions what exactly to inspect in another mail in this thread).  And
failed tests on the tinderboxes will eventually time out either way."
"Re: UITest_writerperfect_epubexport hang (only sometimes)")

Change-Id: I36db7526b68a1cf6be596aa82c57095e4067c150
Reviewed-on: https://gerrit.libreoffice.org/50080Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarStephan Bergmann <sbergman@redhat.com>
üst 3cd3d104
......@@ -178,7 +178,7 @@ class UITest(object):
def execute_blocking_action(self, action, dialog_element=None,
args=(), dialog_handler=None, dialog_timeout=30):
args=(), dialog_handler=None):
"""Executes an action which blocks while a dialog is shown.
Click a button or perform some other action on the dialog when it
......@@ -192,8 +192,6 @@ class UITest(object):
args(tuple, optional): The arguments to be passed to `action`
dialog_handler(callable, optional): Will be called when the dialog
is shown, with the dialog object passed as a parameter.
timeout(optional): The maximum time the thread will wait for the
dialog actions to happen. None means wait forever.
thread = threading.Thread(target=action, args=args)
......@@ -209,9 +207,7 @@ class UITest(object):
xUIElement.executeAction("CLICK", tuple())
if dialog_handler:
if thread.isAlive():
raise DialogNotClosedException()
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment