From f3fe6cbfe4597828e7ab32d0fe9e571a78b3efeb Mon Sep 17 00:00:00 2001 From: Michal Klocek Date: Wed, 3 Apr 2019 15:44:08 +0200 Subject: Make tst_dialogs less flaky Wait to finish javascript execution before opening next dialog. Task-number: QTBUG-72113 Change-Id: I383e3fc3c405a94ddcbd74fe1cc7ab0d81c4e315 Reviewed-by: Allan Sandfeld Jensen --- tests/auto/quick/dialogs/tst_dialogs.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'tests/auto/quick') diff --git a/tests/auto/quick/dialogs/tst_dialogs.cpp b/tests/auto/quick/dialogs/tst_dialogs.cpp index ecc2764fd..d4846a9d0 100644 --- a/tests/auto/quick/dialogs/tst_dialogs.cpp +++ b/tests/auto/quick/dialogs/tst_dialogs.cpp @@ -218,6 +218,7 @@ void tst_Dialogs::javaScriptDialogRequested() QCOMPARE(dialog->type(), type); QCOMPARE(dialog->message(), message); QCOMPARE(dialog->defaultText(), defaultText); + QTRY_VERIFY(m_listner->ready()); // make sure javascript executes no longer } #include "tst_dialogs.moc" -- cgit v1.2.3 From 96ac4c59947785fa53d182389fcb3449ba9049b6 Mon Sep 17 00:00:00 2001 From: Michal Klocek Date: Wed, 3 Apr 2019 18:31:13 +0200 Subject: Increase timeout and add some debug info to tst_dialog Task-number: QTBUG-72113 Change-Id: I9b2dfb360a18995cae9e0e4a98443e796c3d8ad0 Reviewed-by: Allan Sandfeld Jensen --- tests/auto/quick/dialogs/WebView.qml | 2 ++ tests/auto/quick/dialogs/tst_dialogs.cpp | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'tests/auto/quick') diff --git a/tests/auto/quick/dialogs/WebView.qml b/tests/auto/quick/dialogs/WebView.qml index 6509071b8..4f8b7a0ce 100644 --- a/tests/auto/quick/dialogs/WebView.qml +++ b/tests/auto/quick/dialogs/WebView.qml @@ -59,6 +59,8 @@ Window { onLoadingChanged: function(reqeust) { if (reqeust.status === WebEngineView.LoadSucceededStatus) { handler.ready = true + } else { + console.log("Wooohooo loading page from qrc failed !") } } diff --git a/tests/auto/quick/dialogs/tst_dialogs.cpp b/tests/auto/quick/dialogs/tst_dialogs.cpp index d4846a9d0..f3a041b62 100644 --- a/tests/auto/quick/dialogs/tst_dialogs.cpp +++ b/tests/auto/quick/dialogs/tst_dialogs.cpp @@ -117,7 +117,7 @@ void tst_Dialogs::colorDialogRequested() void tst_Dialogs::contextMenuRequested() { m_listner->load(QUrl("qrc:/index.html")); - QTRY_VERIFY(m_listner->ready()); + QTRY_COMPARE_WITH_TIMEOUT(m_listner->ready(), true, 20000); QSignalSpy dialogSpy(m_listner, &TestHandler::requestChanged); QTest::mouseClick(m_widnow, Qt::RightButton); QTRY_COMPARE(dialogSpy.count(), 1); -- cgit v1.2.3