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>
This commit is contained in:
parent
cf10131d44
commit
af19cbc8f3
@ -170,13 +170,6 @@ void tst_QWindow::eventOrderOnShow()
|
|||||||
|
|
||||||
void tst_QWindow::positioning()
|
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(
|
if (!QGuiApplicationPrivate::platformIntegration()->hasCapability(
|
||||||
QPlatformIntegration::NonFullScreenWindows)) {
|
QPlatformIntegration::NonFullScreenWindows)) {
|
||||||
QSKIP("This platform does not support non-fullscreen windows");
|
QSKIP("This platform does not support non-fullscreen windows");
|
||||||
@ -210,6 +203,9 @@ void tst_QWindow::positioning()
|
|||||||
|
|
||||||
window.setWindowState(Qt::WindowFullScreen);
|
window.setWindowState(Qt::WindowFullScreen);
|
||||||
QCoreApplication::processEvents();
|
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);
|
QTRY_COMPARE(window.received(QEvent::Resize), 2);
|
||||||
|
|
||||||
window.setWindowState(Qt::WindowNoState);
|
window.setWindowState(Qt::WindowNoState);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user