From 5e42856947c1ba3888eaff52afe5239f007672c6 Mon Sep 17 00:00:00 2001 From: Robert Loehning Date: Wed, 18 Dec 2013 16:04:03 +0100 Subject: Squish: Fix bug in selectBuildConfig() Function did not wait when configName did not change, even when the active kit did change. Change-Id: Ia0954ee7da45864aefe88ad1919124c065af2ac1 Reviewed-by: Christian Stenger --- tests/system/shared/build_utils.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tests/system/shared/build_utils.py') diff --git a/tests/system/shared/build_utils.py b/tests/system/shared/build_utils.py index 5a34aac4a3..5a2ff968cc 100644 --- a/tests/system/shared/build_utils.py +++ b/tests/system/shared/build_utils.py @@ -184,8 +184,8 @@ def iterateBuildConfigs(kitCount, filter = ""): def selectBuildConfig(targetCount, currentTarget, configName): switchViewTo(ViewConstants.PROJECTS) switchToBuildOrRunSettingsFor(targetCount, currentTarget, ProjectSettings.BUILD) - if selectFromCombo(":scrollArea.Edit build configuration:_QComboBox", configName): - progressBarWait(30000) + selectFromCombo(":scrollArea.Edit build configuration:_QComboBox", configName) + progressBarWait(30000) return getQtInformationForBuildSettings(targetCount, True, ViewConstants.EDIT) # This will not trigger a rebuild. If needed, caller has to do this. -- cgit v1.2.1