From dbdb352318bbd157ec9e0c0627223f34af7b0e73 Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Wed, 8 Aug 2012 16:18:43 +0200 Subject: 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 --- tests/auto/qmdisubwindow/qmdisubwindow.pro | 2 -- tests/auto/qmdisubwindow/tst_qmdisubwindow.cpp | 5 +++++ 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'tests/auto') 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)); } -- cgit v1.2.3