From 01b3e1fa547d8def812d64941968fb5e13516383 Mon Sep 17 00:00:00 2001 From: Robert Loehning Date: Mon, 19 Aug 2013 18:04:16 +0200 Subject: [PATCH] Squish: Fix __startDebugger__() Change-Id: I1f87346ad12f4a6e749042b3c1bcabbc71bdbf7a Reviewed-by: Christian Stenger --- tests/system/shared/debugger.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/tests/system/shared/debugger.py b/tests/system/shared/debugger.py index 649f668c4d0..9a883915792 100644 --- a/tests/system/shared/debugger.py +++ b/tests/system/shared/debugger.py @@ -176,9 +176,8 @@ def __startDebugger__(kitCount, currentKit, config): isMsvcBuild = isMsvcConfig(kitCount, currentKit) clickButton(waitForObject(":*Qt Creator.Start Debugging_Core::Internal::FancyToolButton")) handleDebuggerWarnings(config, isMsvcBuild) - hasNotTimedOut = waitFor("object.exists(':Debugger Toolbar.Continue_QToolButton')", 60000) try: - mBox = findObject(":Failed to start application_QMessageBox") + mBox = waitForObject(":Failed to start application_QMessageBox", 5000) mBoxText = mBox.text mBoxIText = mBox.informativeText clickButton(":DebugModeWidget.OK_QPushButton") @@ -188,10 +187,8 @@ def __startDebugger__(kitCount, currentKit, config): return False except: pass - if hasNotTimedOut: - test.passes("Debugger started...") - else: - test.fail("Debugger seems to have not started...") + if not test.verify(waitFor("object.exists(':Debugger Toolbar.Continue_QToolButton')", 60000), + "Verify start of debugger"): if "MSVC" in config: debuggerLog = takeDebuggerLog() if "lib\qtcreatorcdbext64\qtcreatorcdbext.dll cannot be found." in debuggerLog: