summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Loehning <robert.loehning@theqtcompany.com>2015-02-12 12:57:17 +0100
committerRobert Loehning <robert.loehning@theqtcompany.com>2015-02-12 12:25:46 +0000
commit28971701fd4baa99f294d9393650b83c40754e18 (patch)
tree7eb16c444815d91fc203258e9cdadd136f738bc8
parent62e30ad5627f84ffeba5995ca4ae957b5c5cd15d (diff)
downloadqt-creator-28971701fd4baa99f294d9393650b83c40754e18.tar.gz
Squish: Don't rely on progress bars when parsing qbs project
Task-number: QBS-746 Change-Id: I316934884432953e2137d7e97b73fce352be4cac Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
-rw-r--r--tests/system/suite_general/tst_opencreator_qbs/test.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/tests/system/suite_general/tst_opencreator_qbs/test.py b/tests/system/suite_general/tst_opencreator_qbs/test.py
index b7d363c7cc..27a70a7248 100644
--- a/tests/system/suite_general/tst_opencreator_qbs/test.py
+++ b/tests/system/suite_general/tst_opencreator_qbs/test.py
@@ -39,7 +39,12 @@ def main():
if not startedWithoutPluginError():
return
openQbsProject(pathCreator)
- progressBarWait(200000)
+ test.log("Start parsing project")
naviTreeView = "{column='0' container=':Qt Creator_Utils::NavigationTreeView' text~='qtcreator( \[\S+\])?' type='QModelIndex'}"
+ ntwObject = waitForObject(naviTreeView)
+ if waitFor("ntwObject.model().rowCount(ntwObject) > 2", 200000): # No need to wait for C++-parsing
+ test.log("Parsing project done") # we only need the project
+ else:
+ test.warning("Parsing project timed out")
compareProjectTree(naviTreeView, "projecttree_creator.tsv")
invokeMenuItem("File", "Exit")