From 0d84e957297b4ffa6ab5b0b5bcf8b169d567d298 Mon Sep 17 00:00:00 2001 From: Martin Jones Date: Thu, 25 Aug 2011 14:14:25 +1000 Subject: qsgflickable test is unstable Ensure that the flickable animation finishes before flicking in the other axis is initiated. Task-number: QTBUG-21096 Change-Id: I97bdbc539d9b5af999c0c3d186c35a75a029194d Reviewed-on: http://codereview.qt.nokia.com/3553 Reviewed-by: Qt Sanity Bot Reviewed-by: Martin Jones --- tests/auto/declarative/qsgflickable/tst_qsgflickable.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/auto/declarative/qsgflickable/tst_qsgflickable.cpp b/tests/auto/declarative/qsgflickable/tst_qsgflickable.cpp index fe96453140..4dbff74c56 100644 --- a/tests/auto/declarative/qsgflickable/tst_qsgflickable.cpp +++ b/tests/auto/declarative/qsgflickable/tst_qsgflickable.cpp @@ -460,7 +460,8 @@ void tst_qsgflickable::movingAndDragging() QCOMPARE(dragStartSpy.count(), 1); QCOMPARE(dragEndSpy.count(), 1); - // Don't test moving because a flick could occur + // wait for any motion to end + QTRY_VERIFY(flickable->isMoving() == false); //Horizontal vDragSpy.clear(); -- cgit v1.2.3