From 99deb21b7aa81d6a5d6036af2a5022ede2c07052 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Mon, 30 Sep 2019 11:14:19 +0200 Subject: [PATCH] Squish: Adapt verification of kits Kits are nowadays displayed if configured, but disabled if they do not fit for the respective project. Change-Id: If04a20afde2fc1ada643e45d5eea33e6ace7a4f1 Reviewed-by: Christian Stenger Reviewed-by: Robert Loehning --- tests/system/shared/utils.py | 4 ++-- tests/system/suite_general/tst_create_proj_wizard/test.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/system/shared/utils.py b/tests/system/shared/utils.py index ef46aca7b26..6501f738a2c 100644 --- a/tests/system/shared/utils.py +++ b/tests/system/shared/utils.py @@ -391,9 +391,9 @@ def getConfiguredKits(): test.log("Configured kits: %s" % str(result)) return result -def visibleCheckBoxExists(text): +def enabledCheckBoxExists(text): try: - findObject("{type='QCheckBox' text='%s' visible='1'}" % text) + waitForObject("{type='QCheckBox' text='%s'}" % text, 100) return True except: return False diff --git a/tests/system/suite_general/tst_create_proj_wizard/test.py b/tests/system/suite_general/tst_create_proj_wizard/test.py index 69a69ace30a..1d822c7ca59 100644 --- a/tests/system/suite_general/tst_create_proj_wizard/test.py +++ b/tests/system/suite_general/tst_create_proj_wizard/test.py @@ -93,7 +93,7 @@ def main(): def verifyKitCheckboxes(kits, displayedPlatforms): waitForObject("{type='QLabel' unnamed='1' visible='1' text='Kit Selection'}") - availableCheckboxes = frozenset(filter(visibleCheckBoxExists, kits.keys())) + availableCheckboxes = frozenset(filter(enabledCheckBoxExists, kits.keys())) # verification whether expected, found and configured match expectedShownKits = availableCheckboxes.intersection(displayedPlatforms)