Commit b1e9290b authored by Christian Stenger's avatar Christian Stenger

Squish: Raise some timeouts a bit...

...as these frequently fail on OSX.

Change-Id: I200fa1e57e8ec98221c9a82177565d9e60b79356
Reviewed-by: default avatarRobert Loehning <robert.loehning@qt.io>
parent 80ef8d11
...@@ -58,13 +58,13 @@ def ensureChecked(objectName, shouldBeChecked = True, timeout=20000): ...@@ -58,13 +58,13 @@ def ensureChecked(objectName, shouldBeChecked = True, timeout=20000):
try: try:
# needed for transition Qt::PartiallyChecked -> Qt::Checked -> Qt::Unchecked # needed for transition Qt::PartiallyChecked -> Qt::Checked -> Qt::Unchecked
clicked = 0 clicked = 0
while not waitFor('widget.checkState() == targetState', 1000) and clicked < 2: while not waitFor('widget.checkState() == targetState', 1500) and clicked < 2:
clickButton(widget) clickButton(widget)
clicked += 1 clicked += 1
test.verify(waitFor("widget.checkState() == targetState", 1000)) test.verify(waitFor("widget.checkState() == targetState", 1000))
except: except:
# widgets not derived from QCheckbox don't have checkState() # 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) mouseClick(widget, 10, 6, 0, Qt.LeftButton)
test.verify(waitFor("widget.checked == shouldBeChecked", 1000)) test.verify(waitFor("widget.checked == shouldBeChecked", 1000))
test.log("New state for QCheckBox: %s" % state, test.log("New state for QCheckBox: %s" % state,
......
...@@ -117,7 +117,7 @@ def __compFunc__(it, foundComp, foundCompNames): ...@@ -117,7 +117,7 @@ def __compFunc__(it, foundComp, foundCompNames):
foundCompNames.append(it) foundCompNames.append(it)
def __dbgFunc__(it, foundDbg): def __dbgFunc__(it, foundDbg):
waitFor("object.exists(':Path.Utils_BaseValidatingLineEdit')", 1000) waitFor("object.exists(':Path.Utils_BaseValidatingLineEdit')", 2000)
pathLineEdit = findObject(":Path.Utils_BaseValidatingLineEdit") pathLineEdit = findObject(":Path.Utils_BaseValidatingLineEdit")
foundDbg.append(str(pathLineEdit.text)) foundDbg.append(str(pathLineEdit.text))
......
...@@ -52,7 +52,7 @@ def main(): ...@@ -52,7 +52,7 @@ def main():
type(editor, "<Return>") type(editor, "<Return>")
invokeMenuItem("File", "Save All") invokeMenuItem("File", "Save All")
clickButton(waitForObject(":Qt Creator.CloseDoc_QToolButton")) 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?"): "Header file was shown after closing source?"):
editor = waitForObject(":Qt Creator_CppEditor::Internal::CPPEditorWidget") editor = waitForObject(":Qt Creator_CppEditor::Internal::CPPEditorWidget")
editorText = str(editor.plainText) editorText = str(editor.plainText)
...@@ -80,7 +80,7 @@ def main(): ...@@ -80,7 +80,7 @@ def main():
addCPlusPlusFileToCurrentProject(newClassName, "C++ Class", False, newBasePath=basePath, addCPlusPlusFileToCurrentProject(newClassName, "C++ Class", False, newBasePath=basePath,
expectedSourceName=sourceFileName, expectedSourceName=sourceFileName,
expectedHeaderName=headerFileName) expectedHeaderName=headerFileName)
test.verify(not waitFor("overwritten(sourceFileName)", 500), test.verify(not waitFor("overwritten(sourceFileName)", 2000),
"Source file should not be overwritten.") "Source file should not be overwritten.")
test.verify(not waitFor("overwritten(headerFileName)", 500), test.verify(not waitFor("overwritten(headerFileName)", 500),
"Header file should not be overwritten.") "Header file should not be overwritten.")
...@@ -88,7 +88,7 @@ def main(): ...@@ -88,7 +88,7 @@ def main():
addCPlusPlusFileToCurrentProject(newClassName, "C++ Class", True, newBasePath=basePath, addCPlusPlusFileToCurrentProject(newClassName, "C++ Class", True, newBasePath=basePath,
expectedSourceName=sourceFileName, expectedSourceName=sourceFileName,
expectedHeaderName=headerFileName) expectedHeaderName=headerFileName)
test.verify(waitFor("overwritten(sourceFileName)", 500), test.verify(waitFor("overwritten(sourceFileName)", 2000),
"Source file should be overwritten.") "Source file should be overwritten.")
test.verify(waitFor("overwritten(headerFileName)", 500), test.verify(waitFor("overwritten(headerFileName)", 500),
"Header file should be overwritten.") "Header file should be overwritten.")
......
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