diff options
| author | Sergio Ahumada <sergio.ahumada@nokia.com> | 2012-08-08 14:30:36 (GMT) |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-09 09:09:01 (GMT) |
| commit | 1ae0f6f9077e2364bbbb90208ed0a5e1d385361a (patch) | |
| tree | c7d04b0c66b4d69ef28aabbb3f1f4723e5a6e30a /tests/auto | |
| parent | dbdb352318bbd157ec9e0c0627223f34af7b0e73 (diff) | |
| download | Qt-1ae0f6f9077e2364bbbb90208ed0a5e1d385361a.zip Qt-1ae0f6f9077e2364bbbb90208ed0a5e1d385361a.tar.gz Qt-1ae0f6f9077e2364bbbb90208ed0a5e1d385361a.tar.bz2 | |
tests: Re-enable tst_MacNativeEvents test.
This test is unstable on Mac OS X so marking it with QEXPECT_FAIL and
re-enable the test.
Change-Id: I8549378db1216de7484feb4080e5e2a1522d2418
Reviewed-by: Caroline Chao <caroline.chao@nokia.com>
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/macnativeevents/macnativeevents.pro | 2 | ||||
| -rw-r--r-- | tests/auto/macnativeevents/tst_macnativeevents.cpp | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/tests/auto/macnativeevents/macnativeevents.pro b/tests/auto/macnativeevents/macnativeevents.pro index 39a3523..af34942 100644 --- a/tests/auto/macnativeevents/macnativeevents.pro +++ b/tests/auto/macnativeevents/macnativeevents.pro @@ -14,5 +14,3 @@ SOURCES += expectedeventlist.cpp nativeeventlist.cpp SOURCES += tst_macnativeevents.cpp requires(mac) - -CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/macnativeevents/tst_macnativeevents.cpp b/tests/auto/macnativeevents/tst_macnativeevents.cpp index a5e7d6e..d0cb4fd 100644 --- a/tests/auto/macnativeevents/tst_macnativeevents.cpp +++ b/tests/auto/macnativeevents/tst_macnativeevents.cpp @@ -270,7 +270,11 @@ void tst_MacNativeEvents::testDragWindow() expected.append(new QMouseEvent(QEvent::NonClientAreaMouseButtonRelease, w.mapFromGlobal(titlebar), moveTo, Qt::LeftButton, Qt::NoButton, Qt::NoModifier)); native.play(); - QVERIFY2(expected.waitForAllEvents(), "the test did not receive all expected events!"); + bool waited = expected.waitForAllEvents(); + if (!waited) { + QEXPECT_FAIL("", "QTBUG-26804", Continue); + } + QVERIFY2(waited, "the test did not receive all expected events!"); } void tst_MacNativeEvents::testMouseEnter() |