summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2011-08-25 14:14:25 +1000
committerQt by Nokia <qt-info@nokia.com>2011-08-25 06:39:54 +0200
commit0d84e957297b4ffa6ab5b0b5bcf8b169d567d298 (patch)
tree28ddadbca2129ff82f7aa914ad27bfba05fb75cb
parent970112dfe70ad020596477c0dcf43376171aba6e (diff)
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 <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
-rw-r--r--tests/auto/declarative/qsgflickable/tst_qsgflickable.cpp3
1 files changed, 2 insertions, 1 deletions
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();