From 85d78c24370a5fd40a14997211224608d15197c1 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Tue, 24 Jan 2012 13:17:56 +0100 Subject: [PATCH] Squish: Reset to normal MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Don't work around a bug. Change-Id: I84bd88fa3f0b39fadd1816f39bdd8ba7b8792a90 Reviewed-by: Robert Löhning Reviewed-by: Bill King --- tests/system/shared/hook_utils.py | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/tests/system/shared/hook_utils.py b/tests/system/shared/hook_utils.py index 92c018f26c6..c357b037ef6 100644 --- a/tests/system/shared/hook_utils.py +++ b/tests/system/shared/hook_utils.py @@ -205,23 +205,13 @@ def __configureCustomExecutable__(projectName, port, mkspec, qmakeVersion): test.warning("Configured Squish directory seems to be missing - using fallback without hooking into subprocess.", "Failed to find '%s'" % startAUT) return False - for tries in range(3): - clickButton("{container=':Qt Creator.scrollArea_QScrollArea' occurrence='2' text='Add' type='QPushButton' unnamed='1' visible='1'}") - addMenu = waitForObject("{type='QMenu' visible='1' unnamed='1' }") - activateItem(addMenu, "Custom Executable") - try: - exePathChooser = waitForObject("{buddy={container=':Qt Creator.scrollArea_QScrollArea' text='Executable:' type='QLabel'} " - "type='Utils::PathChooser' unnamed='1' visible='1'}", 2) - exeLineEd = getChildByClass(exePathChooser, "Utils::BaseValidatingLineEdit") - except: - exeLineEd = None - - if exeLineEd and exeLineEd.enabled: - break - if not exeLineEd or not exeLineEd.enabled: - test.warning("Could not add a custom executable (Timing issue) - using fallback without hooking into subprocess.") - return False - + addButton = waitForObject("{container=':Qt Creator.scrollArea_QScrollArea' occurrence='2' text='Add' type='QPushButton' unnamed='1' visible='1'}") + clickButton(addButton) + addMenu = addButton.menu() + activateItem(waitForObjectItem(objectMap.realName(addMenu), 'Custom Executable')) + exePathChooser = waitForObject("{buddy={container=':Qt Creator.scrollArea_QScrollArea' text='Executable:' type='QLabel'} " + "type='Utils::PathChooser' unnamed='1' visible='1'}", 2000) + exeLineEd = getChildByClass(exePathChooser, "Utils::BaseValidatingLineEdit") argLineEd = waitForObject("{buddy={container={type='QScrollArea' name='scrollArea'} " "type='QLabel' text='Arguments:' visible='1'} type='QLineEdit' " "unnamed='1' visible='1'}")