From 28971701fd4baa99f294d9393650b83c40754e18 Mon Sep 17 00:00:00 2001 From: Robert Loehning Date: Thu, 12 Feb 2015 12:57:17 +0100 Subject: [PATCH] Squish: Don't rely on progress bars when parsing qbs project Task-number: QBS-746 Change-Id: I316934884432953e2137d7e97b73fce352be4cac Reviewed-by: Christian Stenger --- tests/system/suite_general/tst_opencreator_qbs/test.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tests/system/suite_general/tst_opencreator_qbs/test.py b/tests/system/suite_general/tst_opencreator_qbs/test.py index b7d363c7cc9..27a70a72489 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")