diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/controls/data/tst_scrollview.qml | 10 | ||||
| -rw-r--r-- | tests/auto/dialogs/tst_dialogs.cpp | 4 | ||||
| -rw-r--r-- | tests/auto/qquicktreemodeladaptor/tst_qquicktreemodeladaptor.cpp | 2 |
3 files changed, 11 insertions, 5 deletions
diff --git a/tests/auto/controls/data/tst_scrollview.qml b/tests/auto/controls/data/tst_scrollview.qml index d3bfac4b..a3c8eab3 100644 --- a/tests/auto/controls/data/tst_scrollview.qml +++ b/tests/auto/controls/data/tst_scrollview.qml @@ -179,6 +179,8 @@ TestCase { } function test_dragFetchAppend() { // QTBUG-50795 + skip("This is flaky: QTBUG-55727. Can't use BLACKLIST because of QTBUG-74117.") + var scrollView = dragFetchAppendComponent.createObject(container) verify(scrollView !== null, "view created is null") waitForRendering(scrollView) @@ -197,8 +199,12 @@ TestCase { mouseRelease(scrollView, scrollView.width - 2, 8 + 16) waitForRendering(scrollView) - verify(Math.round(scrollView.flickableItem.contentHeight) > 60 * 20) - verify(Math.round(scrollView.flickableItem.contentY) < -(60 * 20)) + tryVerify( + function() { return Math.round(scrollView.flickableItem.contentHeight) > 60 * 20 }, + 50, "contentHeight did not adjust to new data.") + tryVerify( + function() { return Math.round(scrollView.flickableItem.contentY) < -(60 * 20) }, + 50, "contentY did not adjust to new data.") scrollView.destroy() } diff --git a/tests/auto/dialogs/tst_dialogs.cpp b/tests/auto/dialogs/tst_dialogs.cpp index 8303ff83..58f23534 100644 --- a/tests/auto/dialogs/tst_dialogs.cpp +++ b/tests/auto/dialogs/tst_dialogs.cpp @@ -159,7 +159,7 @@ void tst_dialogs::dialogButtonHandler() root->setProperty("mustBlock", mustBlock); QQuickWindow *window = root->findChild<QQuickWindow*>(); - QTest::qWaitForWindowExposed(window); + QVERIFY(QTest::qWaitForWindowExposed(window)); /* Hack to find the created buttons: since they are created by a * QQuickRepeater, they don't appear on the hierarchy tree; therefore, we @@ -242,7 +242,7 @@ void tst_dialogs::dialogKeyHandler() root->setProperty("mustBlock", mustBlock); QQuickWindow *window = root->findChild<QQuickWindow*>(); - QTest::qWaitForWindowExposed(window); + QVERIFY(QTest::qWaitForWindowExposed(window)); QTest::keyClick(window, Qt::Key(key)); QTRY_VERIFY(root->property("handlerWasCalled").toBool()); diff --git a/tests/auto/qquicktreemodeladaptor/tst_qquicktreemodeladaptor.cpp b/tests/auto/qquicktreemodeladaptor/tst_qquicktreemodeladaptor.cpp index 96659a2c..0fec548d 100644 --- a/tests/auto/qquicktreemodeladaptor/tst_qquicktreemodeladaptor.cpp +++ b/tests/auto/qquicktreemodeladaptor/tst_qquicktreemodeladaptor.cpp @@ -1384,7 +1384,7 @@ void tst_QQuickTreeModelAdaptor::hasChildrenEmit() QModelIndex root = model.index(0,0); QVERIFY(root.isValid()); - QModelIndex child = root.child(0,0); + QModelIndex child = model.index(0, 0, root); QVERIFY(child.isValid()); // Root not expanded , child not expanded, insert in child, expect no datachanged |