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

[Stephan Bergmann]

 uitest/uitest/test.py |    8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

New commits:
commit ef03e3a36f821e9d85f08cb06e72dc32fbbaade9
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Feb 21 09:39:50 2018 +0100

    Revert "uitest: add timeout for blocking actions"
    
    This reverts commit fb4d5885f3c8d00ae528ddf57b2abaa4aabfbcf3:
    
    "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."
    (<https://lists.freedesktop.org/archives/libreoffice/2018-February/079494.html>
    "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
    UITest_writerperfect_epubexport.
    
    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."
    (<https://lists.freedesktop.org/archives/libreoffice/2018-February/079491.html>
    "Re: UITest_writerperfect_epubexport hang (only sometimes)")
    
    Change-Id: I36db7526b68a1cf6be596aa82c57095e4067c150
    Reviewed-on: https://gerrit.libreoffice.org/50080
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/uitest/uitest/test.py b/uitest/uitest/test.py
index f179807c5b0f..0318dfa64d81 100644
--- a/uitest/uitest/test.py
+++ b/uitest/uitest/test.py
@@ -178,7 +178,7 @@ class UITest(object):
                 time.sleep(DEFAULT_SLEEP)
 
     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:
                         dialog_handler(xDlg)
-                    thread.join(dialog_timeout)
-                    if thread.isAlive():
-                        raise DialogNotClosedException()
+                    thread.join()
                     return
 
                 time_ += DEFAULT_SLEEP