diff options
| author | Sergio Ahumada <sergio.ahumada@nokia.com> | 2012-08-21 17:19:17 (GMT) |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-23 09:35:57 (GMT) |
| commit | eda211868a4875894888c82eeb2fe52cbe73c1bc (patch) | |
| tree | 429edbeaae56e40cb496e3c0179933b8bcf38434 | |
| parent | e645bc3ccfb3c4a8186cbe7864657e97f9536348 (diff) | |
| download | Qt-eda211868a4875894888c82eeb2fe52cbe73c1bc.zip Qt-eda211868a4875894888c82eeb2fe52cbe73c1bc.tar.gz Qt-eda211868a4875894888c82eeb2fe52cbe73c1bc.tar.bz2 | |
test: Mark tst_qdeclarativeflickable unstable failures as XFAIL
The test has two unstable failures, so mark these with QEXPECT_FAIL
Task-number: QTBUG-26905
Change-Id: I1912626376f70ae6d645638fb5b07dbf9e4c3393
Reviewed-by: Caroline Chao <caroline.chao@nokia.com>
| -rw-r--r-- | tests/auto/declarative/qdeclarativeflickable/tst_qdeclarativeflickable.cpp | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/tests/auto/declarative/qdeclarativeflickable/tst_qdeclarativeflickable.cpp b/tests/auto/declarative/qdeclarativeflickable/tst_qdeclarativeflickable.cpp index 7ba001a..ebd8d1b 100644 --- a/tests/auto/declarative/qdeclarativeflickable/tst_qdeclarativeflickable.cpp +++ b/tests/auto/declarative/qdeclarativeflickable/tst_qdeclarativeflickable.cpp @@ -280,7 +280,13 @@ void tst_qdeclarativeflickable::disabledContent() QApplication::sendEvent(canvas->viewport(), &mv); } - QVERIFY(flickable->contentX() < 0); + qreal contentX = flickable->contentX(); +#if defined(Q_OS_LINUX) && defined(QT_BUILD_INTERNAL) + if (contentX >= 0) { + QEXPECT_FAIL("", "QTBUG-26905", Abort); + } +#endif + QVERIFY(contentX < 0); QVERIFY(flickable->contentY() < 0); QTest::mouseRelease(canvas->viewport(), Qt::LeftButton, 0, canvas->mapFromScene(QPoint(90, 90))); @@ -559,7 +565,13 @@ void tst_qdeclarativeflickable::disabled() QTest::mousePress(canvas->viewport(), Qt::LeftButton, 0, canvas->mapFromScene(QPoint(50, 10))); QTest::mouseRelease(canvas->viewport(), Qt::LeftButton, 0, canvas->mapFromScene(QPoint(50, 10))); - QVERIFY(canvas->rootObject()->property("clicked").toBool() == true); + bool clickedToBool = canvas->rootObject()->property("clicked").toBool(); +#if defined(Q_OS_LINUX) && defined(QT_BUILD_INTERNAL) + if (clickedToBool != true) { + QEXPECT_FAIL("", "QTBUG-26905", Abort); + } +#endif + QVERIFY(clickedToBool == true); } |