summaryrefslogtreecommitdiff
path: root/tests/system/suite_general
diff options
context:
space:
mode:
Diffstat (limited to 'tests/system/suite_general')
-rw-r--r--tests/system/suite_general/tst_build_speedcrunch/test.py2
-rw-r--r--tests/system/suite_general/tst_cmake_speedcrunch/test.py2
-rw-r--r--tests/system/suite_general/tst_rename_file/test.py4
-rw-r--r--tests/system/suite_general/tst_session_handling/test.py2
4 files changed, 5 insertions, 5 deletions
diff --git a/tests/system/suite_general/tst_build_speedcrunch/test.py b/tests/system/suite_general/tst_build_speedcrunch/test.py
index 32a132ad63..e3543d55fa 100644
--- a/tests/system/suite_general/tst_build_speedcrunch/test.py
+++ b/tests/system/suite_general/tst_build_speedcrunch/test.py
@@ -42,7 +42,7 @@ def main():
if not startedWithoutPluginError():
return
openQmakeProject(SpeedCrunchPath, [Targets.DESKTOP_4_8_7_DEFAULT])
- progressBarWait(30000)
+ waitForProjectParsing()
fancyToolButton = waitForObject(":*Qt Creator_Core::Internal::FancyToolButton")
diff --git a/tests/system/suite_general/tst_cmake_speedcrunch/test.py b/tests/system/suite_general/tst_cmake_speedcrunch/test.py
index afc196abb8..2d9a3e2def 100644
--- a/tests/system/suite_general/tst_cmake_speedcrunch/test.py
+++ b/tests/system/suite_general/tst_cmake_speedcrunch/test.py
@@ -60,7 +60,7 @@ def main():
test.fatal("Could not open/create cmake project - leaving test")
invokeMenuItem("File", "Exit")
return
- progressBarWait(30000)
+ waitForProjectParsing()
naviTreeView = "{column='0' container=':Qt Creator_Utils::NavigationTreeView' text~='%s' type='QModelIndex'}"
if cmakeSupportsServerMode():
treeFile = "projecttree_speedcrunch_server.tsv"
diff --git a/tests/system/suite_general/tst_rename_file/test.py b/tests/system/suite_general/tst_rename_file/test.py
index 9d46be1d37..cb5d434fe1 100644
--- a/tests/system/suite_general/tst_rename_file/test.py
+++ b/tests/system/suite_general/tst_rename_file/test.py
@@ -46,7 +46,7 @@ def main():
"OTHER_FILES += example.qml")
invokeMenuItem("File", "Save All")
invokeMenuItem("File", "Close All")
- progressBarWait()
+ waitForProjectParsing()
for filetype, filename in [["Headers", "person.h"],
["Sources", "main.cpp"],
["Sources", "person.cpp"],
@@ -66,7 +66,7 @@ def main():
renameFile(templateDir, usedProFile, projectName + "." + tempFiletype,
previous, filename)
# QTCREATORBUG-13176 does update the navigator async
- progressBarWait()
+ waitForProjectParsing()
if filetype == "Headers":
verifyRenamedIncludes(templateDir, "main.cpp", previous, filename)
verifyRenamedIncludes(templateDir, "person.cpp", previous, filename)
diff --git a/tests/system/suite_general/tst_session_handling/test.py b/tests/system/suite_general/tst_session_handling/test.py
index 3a536975f2..702273b265 100644
--- a/tests/system/suite_general/tst_session_handling/test.py
+++ b/tests/system/suite_general/tst_session_handling/test.py
@@ -40,7 +40,7 @@ def main():
checkWelcomePage(sessionName, True)
for project in projects:
openQmakeProject(project, [Targets.DESKTOP_5_6_1_DEFAULT])
- progressBarWait(20000)
+ waitForProjectParsing()
checkNavigator(52, "Verifying whether all projects have been opened.")
openDocument("animation.Resources.animation\\.qrc./animation.basics.animators\\.qml")
openDocument("keyinteraction.Sources.main\\.cpp")