diff options
author | Christian Stenger <christian.stenger@qt.io> | 2016-05-24 12:49:32 +0200 |
---|---|---|
committer | Christian Stenger <christian.stenger@qt.io> | 2016-05-26 05:08:23 +0000 |
commit | b1e9290b73b3173c79f707f8451a79c68fe49dd6 (patch) | |
tree | bf6788d08d50c8fdd55609c9f752094f3474e2c5 | |
parent | 80ef8d11f904dcfc9dddd0984085d9fee71baa30 (diff) | |
download | qt-creator-b1e9290b73b3173c79f707f8451a79c68fe49dd6.tar.gz |
Squish: Raise some timeouts a bit...
...as these frequently fail on OSX.
Change-Id: I200fa1e57e8ec98221c9a82177565d9e60b79356
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
-rw-r--r-- | tests/system/shared/utils.py | 4 | ||||
-rw-r--r-- | tests/system/suite_general/tst_default_settings/test.py | 2 | ||||
-rw-r--r-- | tests/system/suite_general/tst_new_class/test.py | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/tests/system/shared/utils.py b/tests/system/shared/utils.py index 1bd1ac457c..a8ddd7b23e 100644 --- a/tests/system/shared/utils.py +++ b/tests/system/shared/utils.py @@ -58,13 +58,13 @@ def ensureChecked(objectName, shouldBeChecked = True, timeout=20000): try: # needed for transition Qt::PartiallyChecked -> Qt::Checked -> Qt::Unchecked clicked = 0 - while not waitFor('widget.checkState() == targetState', 1000) and clicked < 2: + while not waitFor('widget.checkState() == targetState', 1500) and clicked < 2: clickButton(widget) clicked += 1 test.verify(waitFor("widget.checkState() == targetState", 1000)) except: # widgets not derived from QCheckbox don't have checkState() - if not waitFor('widget.checked == shouldBeChecked', 1000): + if not waitFor('widget.checked == shouldBeChecked', 1500): mouseClick(widget, 10, 6, 0, Qt.LeftButton) test.verify(waitFor("widget.checked == shouldBeChecked", 1000)) test.log("New state for QCheckBox: %s" % state, diff --git a/tests/system/suite_general/tst_default_settings/test.py b/tests/system/suite_general/tst_default_settings/test.py index 5f77277bb0..b7bc5f41da 100644 --- a/tests/system/suite_general/tst_default_settings/test.py +++ b/tests/system/suite_general/tst_default_settings/test.py @@ -117,7 +117,7 @@ def __compFunc__(it, foundComp, foundCompNames): foundCompNames.append(it) def __dbgFunc__(it, foundDbg): - waitFor("object.exists(':Path.Utils_BaseValidatingLineEdit')", 1000) + waitFor("object.exists(':Path.Utils_BaseValidatingLineEdit')", 2000) pathLineEdit = findObject(":Path.Utils_BaseValidatingLineEdit") foundDbg.append(str(pathLineEdit.text)) diff --git a/tests/system/suite_general/tst_new_class/test.py b/tests/system/suite_general/tst_new_class/test.py index c0ab7bbe86..d7b37abddc 100644 --- a/tests/system/suite_general/tst_new_class/test.py +++ b/tests/system/suite_general/tst_new_class/test.py @@ -52,7 +52,7 @@ def main(): type(editor, "<Return>") invokeMenuItem("File", "Save All") clickButton(waitForObject(":Qt Creator.CloseDoc_QToolButton")) - if test.verify(waitFor("headerFileName in str(mainWindow.windowTitle)", 1000), + if test.verify(waitFor("headerFileName in str(mainWindow.windowTitle)", 2000), "Header file was shown after closing source?"): editor = waitForObject(":Qt Creator_CppEditor::Internal::CPPEditorWidget") editorText = str(editor.plainText) @@ -80,7 +80,7 @@ def main(): addCPlusPlusFileToCurrentProject(newClassName, "C++ Class", False, newBasePath=basePath, expectedSourceName=sourceFileName, expectedHeaderName=headerFileName) - test.verify(not waitFor("overwritten(sourceFileName)", 500), + test.verify(not waitFor("overwritten(sourceFileName)", 2000), "Source file should not be overwritten.") test.verify(not waitFor("overwritten(headerFileName)", 500), "Header file should not be overwritten.") @@ -88,7 +88,7 @@ def main(): addCPlusPlusFileToCurrentProject(newClassName, "C++ Class", True, newBasePath=basePath, expectedSourceName=sourceFileName, expectedHeaderName=headerFileName) - test.verify(waitFor("overwritten(sourceFileName)", 500), + test.verify(waitFor("overwritten(sourceFileName)", 2000), "Source file should be overwritten.") test.verify(waitFor("overwritten(headerFileName)", 500), "Header file should be overwritten.") |