aboutsummaryrefslogtreecommitdiffstats
path: root/tests/system/suite_debugger
diff options
context:
space:
mode:
authorRobert Loehning <robert.loehning@qt.io>2017-01-26 13:34:56 +0100
committerRobert Loehning <robert.loehning@qt.io>2017-02-02 10:29:47 +0000
commit0fe03e90b140b0efccdd34e2ce644e0b5fc66c31 (patch)
tree127fd64acf31263956654e07c3175c6221d790c9 /tests/system/suite_debugger
parent3dcbdb8dac86f85d0585570fac645e4393a3d79f (diff)
Squish: Enable tst_qml_js_console again
Task-number: QTCREATORBUG-15831 Change-Id: I31dc06c39c2c038205d2512804757c4d7b3429b7 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Diffstat (limited to 'tests/system/suite_debugger')
-rw-r--r--tests/system/suite_debugger/tst_qml_js_console/test.py7
1 files changed, 2 insertions, 5 deletions
diff --git a/tests/system/suite_debugger/tst_qml_js_console/test.py b/tests/system/suite_debugger/tst_qml_js_console/test.py
index d0d085e5993..7187fc9ceaa 100644
--- a/tests/system/suite_debugger/tst_qml_js_console/test.py
+++ b/tests/system/suite_debugger/tst_qml_js_console/test.py
@@ -56,7 +56,7 @@ def useDebuggerConsole(expression, expectedOutput, check=None, checkOutp=None):
def debuggerHasStopped():
stopDebugger = findObject(":Debugger Toolbar.Exit Debugger_QToolButton")
- fancyDebugButton = findObject(":*Qt Creator.Start Debugging_Core::Internal::FancyToolButton")
+ fancyDebugButton = waitForObject(":*Qt Creator.Start Debugging_Core::Internal::FancyToolButton")
result = test.verify(not stopDebugger.enabled and fancyDebugButton.enabled,
"Verifying whether debugger buttons are in correct state.")
ensureChecked(":Qt Creator_AppOutput_Core::Internal::OutputPaneToggleButton")
@@ -110,9 +110,6 @@ def testLoggingFeatures():
clickButton(":*Qt Creator.Clear_QToolButton")
def main():
- test.warning("This test must be rewritten (QTCREATORBUG-15831)") # QmlJS Console has changed
- return
-
projName = "simpleQuickUI2.qmlproject"
projFolder = os.path.dirname(findFile("testdata", "simpleQuickUI2/%s" % projName))
if not neededFilePresent(os.path.join(projFolder, projName)):
@@ -128,7 +125,7 @@ def main():
return
# if Debug is enabled - 1 valid kit is assigned - real check for this is done in tst_qml_locals
- fancyDebugButton = findObject(":*Qt Creator.Start Debugging_Core::Internal::FancyToolButton")
+ fancyDebugButton = waitForObject(":*Qt Creator.Start Debugging_Core::Internal::FancyToolButton")
if test.verify(waitFor('fancyDebugButton.enabled', 5000), "Start Debugging is enabled."):
# make sure QML Debugging is enabled
switchViewTo(ViewConstants.PROJECTS)