From: Martin Jones <martin.jones@nokia.com>
Date: Thu, 25 Aug 2011 04:14:25 +0000 (+1000)
Subject: qsgflickable test is unstable
X-Git-Tag: qt-v5.0.0-alpha1~1874
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0d84e957297b4ffa6ab5b0b5bcf8b169d567d298;p=profile%2Fivi%2Fqtdeclarative.git

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>
---

diff --git a/tests/auto/declarative/qsgflickable/tst_qsgflickable.cpp b/tests/auto/declarative/qsgflickable/tst_qsgflickable.cpp
index fe96453..4dbff74 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();