From a932c6ebca45773a0b83e984756771bd5a1b6516 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Tue, 30 Jul 2013 09:32:22 +0200 Subject: [PATCH] Squish: Improve invokeMenuItem() Change-Id: I977a9465a944f30fc195e6072f50b663f5d4d24d Reviewed-by: Robert Loehning --- tests/system/shared/utils.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/system/shared/utils.py b/tests/system/shared/utils.py index c64f1f90166..7cd0fe9e5e8 100644 --- a/tests/system/shared/utils.py +++ b/tests/system/shared/utils.py @@ -225,7 +225,7 @@ def cleanUpUserFiles(pathsToProFiles=None): doneWithoutErrors = False return doneWithoutErrors -def invokeMenuItem(menu, item, subItem = None): +def invokeMenuItem(menu, item, *subItems): if platform.system() == "Darwin": try: waitForObject(":Qt Creator.QtCreator.MenuBar_QMenuBar", 2000) @@ -237,10 +237,11 @@ def invokeMenuItem(menu, item, subItem = None): itemObject = waitForObjectItem(objectMap.realName(menuObject), item) waitFor("itemObject.enabled", 2000) activateItem(itemObject) - if subItem != None: + for subItem in subItems: sub = itemObject.menu() waitFor("sub.visible", 1000) - activateItem(waitForObjectItem(sub, subItem)) + itemObject = waitForObjectItem(sub, subItem) + activateItem(itemObject) def logApplicationOutput(): # make sure application output is shown