diff options
| author | Sergio Ahumada <sergio.ahumada@nokia.com> | 2012-08-08 16:18:43 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-09 00:57:32 +0200 |
| commit | dbdb352318bbd157ec9e0c0627223f34af7b0e73 (patch) | |
| tree | f4a4368e2564e0a59b00cd024e579c59988c931e /tests/auto/qmdisubwindow | |
| parent | fe77cabec769b49d0fe61d50d6802fa20d78d366 (diff) | |
tests: Re-enable tst_QMdiSubWindow test.
The test has one unstable failure. Mark this with QEXPECT_FAIL and
re-enable the test.
Change-Id: I2ccbbae4d5367cd9a24577857ed97247018f140e
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'tests/auto/qmdisubwindow')
| -rw-r--r-- | tests/auto/qmdisubwindow/qmdisubwindow.pro | 2 | ||||
| -rw-r--r-- | tests/auto/qmdisubwindow/tst_qmdisubwindow.cpp | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/tests/auto/qmdisubwindow/qmdisubwindow.pro b/tests/auto/qmdisubwindow/qmdisubwindow.pro index d3192782b8..a9a53b581a 100644 --- a/tests/auto/qmdisubwindow/qmdisubwindow.pro +++ b/tests/auto/qmdisubwindow/qmdisubwindow.pro @@ -2,5 +2,3 @@ load(qttest_p4) INCLUDEPATH += . SOURCES += tst_qmdisubwindow.cpp DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII - -mac:CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/qmdisubwindow/tst_qmdisubwindow.cpp b/tests/auto/qmdisubwindow/tst_qmdisubwindow.cpp index 6a09372fa4..796ba6157c 100644 --- a/tests/auto/qmdisubwindow/tst_qmdisubwindow.cpp +++ b/tests/auto/qmdisubwindow/tst_qmdisubwindow.cpp @@ -812,6 +812,11 @@ void tst_QMdiSubWindow::setOpaqueResizeAndMove() // Leave move mode sendMouseRelease(window, mousePosition); +#ifdef Q_OS_MAC + if (moveSpy.count() != expectedGeometryCount) { + QEXPECT_FAIL("", "QTBUG-26803", Abort); + } +#endif QCOMPARE(moveSpy.count(), expectedGeometryCount); QCOMPARE(window->size(), windowSize + QSize(geometryCount, geometryCount)); } |