feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Squish: Reset to normal

Browse Source 
Don't work around a bug.

Change-Id: I84bd88fa3f0b39fadd1816f39bdd8ba7b8792a90
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
Reviewed-by: Bill King <bill.king@nokia.com>
This commit is contained in:
Christian Stenger
2012-01-24 13:17:56 +01:00
parent 0d573bc5b3
commit 85d78c2437
1 changed files with 7 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
tests/system/shared/hook_utils.py
View File

@@ -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'}")