aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/qml
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@qt.io>2018-04-06 12:14:17 +0200
committerUlf Hermann <ulf.hermann@qt.io>2018-04-06 10:57:40 +0000
commitd7ada80e5c134a0d1a13539a46e378b7ea6dcf6d (patch)
treea03a56d833f3f1eeb305bf30088d5e2e821e2017 /tests/auto/qml
parentb780aeb0ce30b040b9057f1e2b447b08b24b45cb (diff)
QQmlDebuggingEnabler test: Relax output string condition
Apparently the "qml: " prefix to strings output via console.log() is not reliable. We can also get "qml <function> - ", as seen in the test log. Also, increase the timeouts. The test log indicates that they are too small. Change-Id: Icb0da329e52273f9300504047b79b1ad41c02892 Task-number: QTBUG-67505 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'tests/auto/qml')
-rw-r--r--tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenabler/tst_qqmldebuggingenabler.cpp12
1 files changed, 8 insertions, 4 deletions
diff --git a/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenabler/tst_qqmldebuggingenabler.cpp b/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenabler/tst_qqmldebuggingenabler.cpp
index a76740a3f9..52e7f85e52 100644
--- a/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenabler/tst_qqmldebuggingenabler.cpp
+++ b/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenabler/tst_qqmldebuggingenabler.cpp
@@ -126,8 +126,10 @@ void tst_QQmlDebuggingEnabler::qmlscene()
}
QCOMPARE(m_process->state(), QLatin1String("running"));
- if (!blockMode)
- QTRY_VERIFY(m_process->output().contains(QLatin1String("qml: Component.onCompleted")));
+ if (!blockMode) {
+ QTRY_VERIFY_WITH_TIMEOUT(m_process->output().contains(
+ QLatin1String("Component.onCompleted")), 15000);
+ }
}
void tst_QQmlDebuggingEnabler::custom_data()
@@ -171,8 +173,10 @@ void tst_QQmlDebuggingEnabler::custom()
}
QCOMPARE(m_process->state(), QLatin1String("running"));
- if (!blockMode)
- QTRY_VERIFY(m_process->output().contains(QLatin1String("QQmlEngine created")));
+ if (!blockMode) {
+ QTRY_VERIFY_WITH_TIMEOUT(m_process->output().contains(QLatin1String("QQmlEngine created")),
+ 15000);
+ }
}
QTEST_MAIN(tst_QQmlDebuggingEnabler)