From eeb7ecbb4008c32f98da090d7958ad35274c13c0 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Thu, 14 Jun 2012 14:28:00 +0200 Subject: [PATCH] Squish: Fix for UI change MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Additionally changed waiting for TargetSelector from 20s to only 5s. Change-Id: I2e342faa6f87b86335bb01f28832ad9c01a27ffb Reviewed-by: Robert Löhning --- tests/system/shared/hook_utils.py | 5 +++-- tests/system/shared/project_explorer.py | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/system/shared/hook_utils.py b/tests/system/shared/hook_utils.py index 9f0f54e8006..8b7551f0b31 100644 --- a/tests/system/shared/hook_utils.py +++ b/tests/system/shared/hook_utils.py @@ -78,8 +78,9 @@ def modifyRunSettingsForHookIntoQtQuickUI(projectName, port): "window=':Qt Creator_Core::Internal::MainWindow' occurrence='2'}") clickButton(addRunConfig) activateItem(waitForObject("{type='QMenu' visible='1' unnamed='1'}"), "Custom Executable") - exePathChooser = waitForObject("{buddy={window=':Qt Creator_Core::Internal::MainWindow' text='Executable:' " - "type='QLabel'} type='Utils::PathChooser' unnamed='1' visible='1'}") + exePathChooser = waitForObject("{buddy={window=':Qt Creator_Core::Internal::MainWindow' text='Command:' " + "type='QLabel' unnamed='1' visible='1'} type='Utils::PathChooser' " + "unnamed='1' visible='1'}") exeLineEd = getChildByClass(exePathChooser, "Utils::BaseValidatingLineEdit") argLineEd = waitForObject("{buddy={window=':Qt Creator_Core::Internal::MainWindow' type='QLabel' " "text='Arguments:' visible='1'} type='QLineEdit' unnamed='1' visible='1'}") diff --git a/tests/system/shared/project_explorer.py b/tests/system/shared/project_explorer.py index 643182f3f4d..5ff9939f4e8 100644 --- a/tests/system/shared/project_explorer.py +++ b/tests/system/shared/project_explorer.py @@ -76,7 +76,7 @@ def prepareBuildSettings(targetCount, currentTarget, setReleaseBuild=True, disab def switchToBuildOrRunSettingsFor(targetCount, currentTarget, projectSettings, isQtQuickUI=False): try: targetSel = waitForObject("{type='ProjectExplorer::Internal::TargetSelector' unnamed='1' " - "visible='1' window=':Qt Creator_Core::Internal::MainWindow'}") + "visible='1' window=':Qt Creator_Core::Internal::MainWindow'}", 5000) except LookupError: # if it's a QtQuick UI - this depends on the creator version - so better not fatal if isQtQuickUI: