diff options
| -rw-r--r-- | sc/qa/uitest/calc_tests6/autocorrectOptions.py | 3 | ||||
| -rw-r--r-- | sd/qa/uitest/impress_tests/autocorrectOptions.py | 3 | ||||
| -rw-r--r-- | sw/qa/uitest/writer_tests5/autocorrectOptions.py | 3 | ||||
| -rw-r--r-- | uitest/uitest/test.py | 8 |
4 files changed, 5 insertions, 12 deletions
diff --git a/sc/qa/uitest/calc_tests6/autocorrectOptions.py b/sc/qa/uitest/calc_tests6/autocorrectOptions.py index 5ceed8779a56..146e3300f64a 100644 --- a/sc/qa/uitest/calc_tests6/autocorrectOptions.py +++ b/sc/qa/uitest/calc_tests6/autocorrectOptions.py @@ -8,7 +8,6 @@ from uitest.framework import UITestCase from libreoffice.uno.propertyvalue import mkPropertyValues from uitest.uihelper.common import get_state_as_dict import time -from uitest.config import MAX_WAIT from uitest.debug import sleep from uitest.uihelper.common import select_pos @@ -20,7 +19,7 @@ class autocorrectOptions(UITestCase): gridwin = xCalcDoc.getChild("grid_window") document = self.ui_test.get_component() - self.ui_test.execute_dialog_through_command(".uno:AutoCorrectDlg", maxWait=10*MAX_WAIT) + self.ui_test.execute_dialog_through_command(".uno:AutoCorrectDlg") xDialog = self.xUITest.getTopFocusWindow() xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "0") #tab replace diff --git a/sd/qa/uitest/impress_tests/autocorrectOptions.py b/sd/qa/uitest/impress_tests/autocorrectOptions.py index d291b67969af..759304e01071 100644 --- a/sd/qa/uitest/impress_tests/autocorrectOptions.py +++ b/sd/qa/uitest/impress_tests/autocorrectOptions.py @@ -8,7 +8,6 @@ from uitest.framework import UITestCase from libreoffice.uno.propertyvalue import mkPropertyValues from uitest.uihelper.common import get_state_as_dict import time -from uitest.config import MAX_WAIT from uitest.debug import sleep from uitest.uihelper.common import select_pos @@ -21,7 +20,7 @@ class autocorrectOptions(UITestCase): self.ui_test.close_dialog_through_button(xCancelBtn) document = self.ui_test.get_component() - self.ui_test.execute_dialog_through_command(".uno:AutoCorrectDlg", maxWait=10*MAX_WAIT) + self.ui_test.execute_dialog_through_command(".uno:AutoCorrectDlg") xDialog = self.xUITest.getTopFocusWindow() xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "0") #tab replace diff --git a/sw/qa/uitest/writer_tests5/autocorrectOptions.py b/sw/qa/uitest/writer_tests5/autocorrectOptions.py index ce58c7f9da1e..55d4b382cd3e 100644 --- a/sw/qa/uitest/writer_tests5/autocorrectOptions.py +++ b/sw/qa/uitest/writer_tests5/autocorrectOptions.py @@ -8,7 +8,6 @@ from uitest.framework import UITestCase from libreoffice.uno.propertyvalue import mkPropertyValues from uitest.uihelper.common import get_state_as_dict import time -from uitest.config import MAX_WAIT from uitest.debug import sleep from uitest.uihelper.common import select_pos @@ -19,7 +18,7 @@ class autocorrectOptions(UITestCase): document = self.ui_test.get_component() xWriterDoc = self.xUITest.getTopFocusWindow() - self.ui_test.execute_dialog_through_command(".uno:AutoCorrectDlg", maxWait=10*MAX_WAIT) + self.ui_test.execute_dialog_through_command(".uno:AutoCorrectDlg") xDialog = self.xUITest.getTopFocusWindow() xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "0") #tab replace diff --git a/uitest/uitest/test.py b/uitest/uitest/test.py index ab8f650d548d..556fb511cc97 100644 --- a/uitest/uitest/test.py +++ b/uitest/uitest/test.py @@ -81,20 +81,16 @@ class UITest(object): time_ += DEFAULT_SLEEP time.sleep(DEFAULT_SLEEP) - def execute_dialog_through_command(self, command, printNames=False, maxWait=MAX_WAIT): + def execute_dialog_through_command(self, command, printNames=False): with EventListener(self._xContext, "DialogExecute", printNames=printNames) as event: if not self._xUITest.executeDialog(command): raise DialogNotExecutedException(command) - time_ = 0 - while time_ < maxWait: + while True: if event.executed: time.sleep(DEFAULT_SLEEP) return - time_ += DEFAULT_SLEEP time.sleep(DEFAULT_SLEEP) - raise DialogNotExecutedException(command) - def execute_modeless_dialog_through_command(self, command, printNames=False): with EventListener(self._xContext, "ModelessDialogVisible", printNames = printNames) as event: if not self._xUITest.executeCommand(command): |