diff options
Diffstat (limited to 'uitest')
| -rw-r--r-- | uitest/uitest/test.py | 8 |
1 files changed, 2 insertions, 6 deletions
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 |