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

Squish: Small fixes for utils.py

Browse Source 
* invokeMenuItem(): changed order and additional
  waitFor to be more error-proof on Mac
* logApplicationOutput(): added try/except block
  for cases where no former run/debug could be found

Change-Id: I0d434fbb964e3d85e5ccb2a4c336e14e956f44ce
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
This commit is contained in:
Christian Stenger
2012-04-02 15:26:14 +02:00
committed by Robert Löhning
parent 5254e3e547
commit a96cbcf335
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/system/shared/utils.py
View File

@@ -181,9 +181,10 @@ def cleanUpUserFiles(pathsToProFiles=None):
def invokeMenuItem(menu, item, subItem = None): def invokeMenuItem(menu, item, subItem = None):
menuObject = waitForObjectItem(":Qt Creator.QtCreator.MenuBar_QMenuBar", menu) menuObject = waitForObjectItem(":Qt Creator.QtCreator.MenuBar_QMenuBar", menu)
waitFor("menuObject.visible", 1000)
activateItem(menuObject) activateItem(menuObject)
itemObject = waitForObjectItem(objectMap.realName(menuObject), item) itemObject = waitForObjectItem(objectMap.realName(menuObject), item)
waitFor("menuObject.visible", 1000) waitFor("itemObject.enabled", 2000)
activateItem(itemObject) activateItem(itemObject)
if subItem != None: if subItem != None:
sub = itemObject.menu() sub = itemObject.menu()
@@ -194,8 +195,11 @@ def logApplicationOutput():
# make sure application output is shown # make sure application output is shown
ensureChecked("{type='Core::Internal::OutputPaneToggleButton' unnamed='1' visible='1' " ensureChecked("{type='Core::Internal::OutputPaneToggleButton' unnamed='1' visible='1' "
"window=':Qt Creator_Core::Internal::MainWindow' occurrence='3'}") "window=':Qt Creator_Core::Internal::MainWindow' occurrence='3'}")
try:
output = waitForObject("{type='Core::OutputWindow' visible='1' windowTitle='Application Output Window'}", 20000) output = waitForObject("{type='Core::OutputWindow' visible='1' windowTitle='Application Output Window'}", 20000)
test.log("Application Output:\n%s" % output.plainText) test.log("Application Output:\n%s" % output.plainText)
except:
test.fail("Could not find any Application Output - did the project run?")
# get the output from a given cmdline call # get the output from a given cmdline call
def getOutputFromCmdline(cmdline): def getOutputFromCmdline(cmdline):