From 7e4e06796ea1c4c2dd0fb9f0c12b875f0c878590 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Mon, 2 Apr 2012 13:33:10 +0200 Subject: [PATCH] Squish: Small fixes for runAndCloseApp() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I74136202c2d5e482a18a56ea2c0ba11d9d958574 Reviewed-by: Robert Löhning --- tests/system/shared/project.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/system/shared/project.py b/tests/system/shared/project.py index cb68aa299c1..80fc9a3cb7c 100644 --- a/tests/system/shared/project.py +++ b/tests/system/shared/project.py @@ -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: