summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorSergio Ahumada <sergio.ahumada@digia.com>2013-07-10 14:08:52 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-07-10 17:40:53 +0200
commitaf19cbc8f33af933a3a4e2d16daac84acbad94be (patch)
tree5c30fbcae3631b8e220438e92ad73ff5ed48c954 /tests
parentcf10131d441eee9203ae11f557e20d1bf255b50e (diff)
test: Replace QSKIP with QEXPECT_FAIL in tst_qwindow
It is better to mark a test as XFAIL so we get an error whenever it gets fixed. Task-number: QTBUG-23059 Change-Id: I0f2f491645c261bf0e735dde6a16d8e90e0b17a0 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@digia.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/gui/kernel/qwindow/tst_qwindow.cpp10
1 files changed, 3 insertions, 7 deletions
diff --git a/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp b/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp
index d34ab069c3..5d4475a252 100644
--- a/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp
+++ b/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp
@@ -170,13 +170,6 @@ void tst_QWindow::eventOrderOnShow()
void tst_QWindow::positioning()
{
-#ifdef Q_OS_MAC
- // the fullscreen animation delay on OS X Lion also causes failures in
- // the isActive() test below, so it's best to just skip it for now
- QSKIP("Multiple failures in this test on Mac OS X, see QTBUG-23059");
-#endif
-
-
if (!QGuiApplicationPrivate::platformIntegration()->hasCapability(
QPlatformIntegration::NonFullScreenWindows)) {
QSKIP("This platform does not support non-fullscreen windows");
@@ -210,6 +203,9 @@ void tst_QWindow::positioning()
window.setWindowState(Qt::WindowFullScreen);
QCoreApplication::processEvents();
+#ifdef Q_OS_MACX
+ QEXPECT_FAIL("", "Multiple failures in this test on Mac OS X, see QTBUG-23059", Abort);
+#endif
QTRY_COMPARE(window.received(QEvent::Resize), 2);
window.setWindowState(Qt::WindowNoState);