Commit 7e4e0679 authored by Christian Stenger's avatar Christian Stenger
Browse files

Squish: Small fixes for runAndCloseApp()



Change-Id: I74136202c2d5e482a18a56ea2c0ba11d9d958574
Reviewed-by: default avatarRobert Löhning <robert.loehning@nokia.com>
parent d6a2667d
......@@ -293,6 +293,7 @@ def __chooseTargets__(targets=QtQuickConstants.Targets.DESKTOP, availableTargets
def runAndCloseApp(withHookInto=False, executable=None, port=None, function=None, sType=None, userDefinedType=None):
global processStarted, processExited
processStarted = processExited = False
overrideInstallLazySignalHandler()
installLazySignalHandler("{type='ProjectExplorer::ApplicationLaucher'}", "processStarted()", "__handleProcessStarted__")
installLazySignalHandler("{type='ProjectExplorer::ApplicationLaucher'}", "processExited(int)", "__handleProcessExited__")
runButton = waitForObject("{type='Core::Internal::FancyToolButton' text='Run' visible='1'}", 20000)
......@@ -309,7 +310,7 @@ def runAndCloseApp(withHookInto=False, executable=None, port=None, function=None
test.fatal("Couldn't start application - leaving test")
invokeMenuItem("File", "Exit")
return False
if os.getenv("SYSTEST_QMLVIEWER_NO_HOOK_INTO", "0") == "1":
if sType == SubprocessType.QT_QUICK_UI and os.getenv("SYSTEST_QMLVIEWER_NO_HOOK_INTO", "0") == "1":
withHookInto = False
if withHookInto and not validType(sType, userDefinedType):
if function != None:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment