From 990e2a83caf59cf5d1bf41be39e9322665c81c05 Mon Sep 17 00:00:00 2001 From: Robert Loehning Date: Fri, 13 May 2016 17:37:41 +0200 Subject: [PATCH] Squish: Fix tst_HELP02 We don't just need any items in the model, we need an item that passes the filter. Change-Id: I831a8a2d4ba27c838e7ea07625d066a19946a789 Reviewed-by: Christian Stenger --- tests/system/suite_HELP/tst_HELP02/test.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tests/system/suite_HELP/tst_HELP02/test.py b/tests/system/suite_HELP/tst_HELP02/test.py index e0ec1aa8a97..82079dfa466 100755 --- a/tests/system/suite_HELP/tst_HELP02/test.py +++ b/tests/system/suite_HELP/tst_HELP02/test.py @@ -50,12 +50,15 @@ def getQtCreatorVersionFromFile(): return "" def checkQtCreatorHelpVersion(expectedVersion): + def rightStart(x): + return x.startswith('Qt Creator Manual') + switchViewTo(ViewConstants.HELP) try: helpContentWidget = waitForObject(':Qt Creator_QHelpContentWidget', 5000) - waitFor("helpContentWidget.model().rowCount > 0", 2000) + waitFor("any(map(rightStart, dumpItems(helpContentWidget.model())))", 2000) items = dumpItems(helpContentWidget.model()) - test.compare(filter(lambda x: x.startswith('Qt Creator Manual'), items)[0], + test.compare(filter(rightStart, items)[0], 'Qt Creator Manual %s' % expectedVersion, 'Verifying whether manual uses expected version.') except: