From af00fe5d89d54ce794978d9c8c6b0fb4726f63c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Fri, 14 Jul 2017 14:30:01 +0200 Subject: [PATCH] macOS: Skip tst_QWindow::modalDialog The tests uses QWindow::requestActivate() to verify that a window does not become active when a modal dialog is running, but on macOS we have no guards for this, so the test can potentially fail. In addition, due to a bug in QCocoaEventDispatcher, we end up waiting 5 seconds for that failure to manifest. Task-number: QTBUG-61965 Task-number: QTBUG-61964 Change-Id: I2f1b62d953e9b6dabf2df0c3023564f27919c498 Reviewed-by: Timur Pocheptsov --- tests/auto/gui/kernel/qwindow/tst_qwindow.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp b/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp index 9ef8699164..f24fd2534e 100644 --- a/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp +++ b/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp @@ -1851,6 +1851,9 @@ void tst_QWindow::modalDialog() if (!QGuiApplication::platformName().compare(QLatin1String("wayland"), Qt::CaseInsensitive)) QSKIP("Wayland: This fails. Figure out why."); + if (QGuiApplication::platformName() == QLatin1String("cocoa")) + QSKIP("Test fails due to QTBUG-61965, and is slow due to QTBUG-61964"); + QWindow normalWindow; normalWindow.setFramePosition(m_availableTopLeft + QPoint(80, 80)); normalWindow.resize(m_testWindowSize);